Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2016-04-27 15:48:59 -05:00
commit e3d2b68c49
1 changed files with 5 additions and 3 deletions

View File

@ -1,9 +1,11 @@
{ {
"private": true, "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", "laravel-elixir": "^5.0.0",
"bootstrap-sass": "^3.0.0" "bootstrap-sass": "^3.0.0"
} }