Merge branch 'master' into kondor
This commit is contained in:
commit
24246b2414
|
@ -29,7 +29,8 @@
|
||||||
"grunt-wiredep": "^2.0.0",
|
"grunt-wiredep": "^2.0.0",
|
||||||
"jit-grunt": "^0.9.1",
|
"jit-grunt": "^0.9.1",
|
||||||
"jshint-stylish": "^2.1.0",
|
"jshint-stylish": "^2.1.0",
|
||||||
"time-grunt": "^1.2.2"
|
"time-grunt": "^1.2.2",
|
||||||
|
"process-nextick-args": "^1.0.7"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "grunt serve"
|
"start": "grunt serve"
|
||||||
|
|
Reference in New Issue