Merge branch 'master' into develop
This commit is contained in:
commit
e3d2b68c49
|
@ -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"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue