Merge branch 'master' into develop

e3d2b68c · Taylor Otwell · 020bf231 · 76b8ef72 · e3d2b68c
Commit e3d2b68c authored Apr 27, 2016 by Taylor Otwell
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

package.json
+5 -3

No files found.
--- a/package.json
+++ b/package.json
 {
  "private": true,
-  "devDependencies": {
+  "scripts": {
-    "gulp": "^3.9.1"
+    "prod": "gulp --production",
+    "dev": "gulp watch"
  },
-  "dependencies": {
+  "devDependencies": {
+    "gulp": "^3.9.1",
    "laravel-elixir": "^5.0.0",
    "bootstrap-sass": "^3.0.0"
  }