Browse Source

Merge remote-tracking branch 'origin/master'

Taylor Otwell 8 years ago
parent
commit
f478406894
2 changed files with 2 additions and 1 deletions
  1. 1 0
      .gitignore
  2. 1 1
      package.json

+ 1 - 0
.gitignore

@@ -1,4 +1,5 @@
 /vendor
 /node_modules
 Homestead.yaml
+Homestead.json
 .env

+ 1 - 1
package.json

@@ -4,7 +4,7 @@
     "gulp": "^3.8.8"
   },
   "dependencies": {
-    "laravel-elixir": "^2.0.0",
+    "laravel-elixir": "^3.0.0",
     "bootstrap-sass": "^3.0.0"
   }
 }