aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-12-28 19:53:35 -0800
committerChris Rebert <[email protected]>2014-12-28 19:53:35 -0800
commitf149e4309add96394ed072265cca84aabd623649 (patch)
treeee2297448809f3db191091ae48d5547727359389
parentac78d16e41de8fe7a221576e098dfd0e2abf8b0e (diff)
parentd6ab6731e67e25d93e263bb70393071f5b3389ea (diff)
downloadbootstrap-f149e4309add96394ed072265cca84aabd623649.tar.xz
bootstrap-f149e4309add96394ed072265cca84aabd623649.zip
Merge pull request #15455 from twbs/bump-uglify
bump grunt-contrib-uglify to ~0.7.0
-rw-r--r--package.json2
-rw-r--r--test-infra/npm-shrinkwrap.json4
2 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index 8ebba8c42..91d807dea 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
"grunt-contrib-jshint": "~0.10.0",
"grunt-contrib-less": "~0.12.0",
"grunt-contrib-qunit": "~0.5.2",
- "grunt-contrib-uglify": "~0.6.0",
+ "grunt-contrib-uglify": "~0.7.0",
"grunt-contrib-watch": "~0.6.1",
"grunt-csscomb": "~3.0.0",
"grunt-exec": "~0.4.6",
diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json
index 4fcb9d134..c0053f4be 100644
--- a/test-infra/npm-shrinkwrap.json
+++ b/test-infra/npm-shrinkwrap.json
@@ -2398,8 +2398,8 @@
}
},
"grunt-contrib-uglify": {
- "version": "0.6.0",
- "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.6.0.tgz",
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.7.0.tgz",
"dependencies": {
"chalk": {
"version": "0.5.1",