Commit f4784068 authored by Taylor Otwell's avatar Taylor Otwell

Merge remote-tracking branch 'origin/master'

parents da7376d4 51299e78
/vendor
/node_modules
Homestead.yaml
Homestead.json
.env
......@@ -4,7 +4,7 @@
"gulp": "^3.8.8"
},
"dependencies": {
"laravel-elixir": "^2.0.0",
"laravel-elixir": "^3.0.0",
"bootstrap-sass": "^3.0.0"
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment