Merge branch 'master' into greenkeeper-grunt-contrib-copy-1.0.0
* master: chore(package): update grunt-contrib-compress to version 1.1.0 # Conflicts: # package.json
This commit is contained in:
commit
37a619af24
|
@ -29,7 +29,7 @@
|
||||||
"grunt": "^0.4.5",
|
"grunt": "^0.4.5",
|
||||||
"grunt-bump": "0.7.0",
|
"grunt-bump": "0.7.0",
|
||||||
"grunt-contrib-clean": "^1.0.0",
|
"grunt-contrib-clean": "^1.0.0",
|
||||||
"grunt-contrib-compress": "^1.0.0",
|
"grunt-contrib-compress": "^1.1.0",
|
||||||
"grunt-contrib-copy": "^1.0.0",
|
"grunt-contrib-copy": "^1.0.0",
|
||||||
"grunt-gh-pages": "^1.0.0",
|
"grunt-gh-pages": "^1.0.0",
|
||||||
"grunt-text-replace": "^0.4.0",
|
"grunt-text-replace": "^0.4.0",
|
||||||
|
|
Loading…
Reference in New Issue