Merge remote-tracking branch 'origin/master'

2015-08-06 12:07:10 -05:00
parent da7376d461 51299e78cd
commit f478406894
2 changed files with 2 additions and 1 deletions
@@ -1,4 +1,5 @@
 /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"
  }
 }