Merge branch 'master' into kondor
This commit is contained in:
commit
8015bb01d3
|
@ -4,6 +4,8 @@
|
||||||
"description": "For the api warehost a web client",
|
"description": "For the api warehost a web client",
|
||||||
"main": "Gruntfile.js",
|
"main": "Gruntfile.js",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"clone": "^2.1.0",
|
||||||
|
"clone-stats": "^1.0.0",
|
||||||
"grunt": "^0.4.5",
|
"grunt": "^0.4.5",
|
||||||
"grunt-angular-templates": "^0.5.9",
|
"grunt-angular-templates": "^0.5.9",
|
||||||
"grunt-asset-injector": "^0.1.0",
|
"grunt-asset-injector": "^0.1.0",
|
||||||
|
@ -27,10 +29,12 @@
|
||||||
"grunt-svgmin": "^3.1.0",
|
"grunt-svgmin": "^3.1.0",
|
||||||
"grunt-usemin": "^3.1.1",
|
"grunt-usemin": "^3.1.1",
|
||||||
"grunt-wiredep": "^2.0.0",
|
"grunt-wiredep": "^2.0.0",
|
||||||
|
"imagemin": "^5.2.2",
|
||||||
"jit-grunt": "^0.9.1",
|
"jit-grunt": "^0.9.1",
|
||||||
"jshint-stylish": "^2.1.0",
|
"jshint-stylish": "^2.1.0",
|
||||||
|
"process-nextick-args": "^1.0.7",
|
||||||
"time-grunt": "^1.2.2",
|
"time-grunt": "^1.2.2",
|
||||||
"process-nextick-args": "^1.0.7"
|
"util-deprecate": "^1.0.2"
|
||||||
},
|
},
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "grunt serve"
|
"start": "grunt serve"
|
||||||
|
|
Reference in New Issue