aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-02-06 12:28:43 -0800
committerMark Otto <[email protected]>2016-02-06 12:28:43 -0800
commitbb9d91182d370321c3e4c99c2d64745fab6b8f15 (patch)
tree5b54764c5ecfcd86a100444d3be1d350875eb3c8 /package.json
parent03ec195974077caa54f13dfb89066d70f760a15d (diff)
parent7fe2cdde7081a5ff657c011c3f03bcfc9d779e2f (diff)
downloadbootstrap-bb9d91182d370321c3e4c99c2d64745fab6b8f15.tar.xz
bootstrap-bb9d91182d370321c3e4c99c2d64745fab6b8f15.zip
Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index b144febd1..0f65326b1 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
"grunt-contrib-connect": "~0.11.2",
"grunt-contrib-copy": "~0.8.1",
"grunt-contrib-cssmin": "~0.14.0",
- "grunt-contrib-qunit": "~0.7.0",
+ "grunt-contrib-qunit": "~1.0.1",
"grunt-contrib-sass": "^0.9.2",
"grunt-contrib-uglify": "~0.11.0",
"grunt-contrib-watch": "~0.6.1",
@@ -51,7 +51,7 @@
"grunt-exec": "~0.4.6",
"grunt-html": "~5.0.0",
"grunt-jekyll": "~0.4.2",
- "grunt-jscs": "~2.6.0",
+ "grunt-jscs": "~2.7.0",
"grunt-line-remover": "0.0.2",
"grunt-postcss": "^0.7.0",
"grunt-sass": "^1.0.0",
@@ -63,7 +63,7 @@
"markdown-it": "^5.0.0",
"mq4-hover-shim": "^0.3.0",
"npm-shrinkwrap": "^200.1.0",
- "shelljs": "^0.5.3",
+ "shelljs": "^0.6.0",
"time-grunt": "^1.2.1"
},
"engines": {