aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-18 14:11:36 -0800
committerMark Otto <[email protected]>2014-01-18 14:11:36 -0800
commit689e75e4b1b8055e657b30eb692b34ebf9d549da (patch)
tree711f3f78d34a69f34ee40fa24a7e8fc4f961ae00 /package.json
parentb886fd2f012f3ebe68292aaedf55d5c3709f972b (diff)
parentb1721f42cc8298fb691530614ee6d52389872e25 (diff)
downloadbootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.tar.xz
bootstrap-689e75e4b1b8055e657b30eb692b34ebf9d549da.zip
Merge branch 'master' into text-emphasis-variant
Diffstat (limited to 'package.json')
-rw-r--r--package.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json
index 6d44ee937..4d73b69d1 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
}
],
"devDependencies": {
- "browserstack-runner": "~0.0.13",
+ "browserstack-runner": "~0.0.14",
"btoa": "~1.1.1",
"grunt": "~0.4.2",
"grunt-banner": "~0.2.0",
@@ -38,7 +38,7 @@
"grunt-contrib-jade": "~0.9.1",
"grunt-contrib-jshint": "~0.8.0",
"grunt-contrib-less": "~0.9.0",
- "grunt-contrib-qunit": "~0.3.0",
+ "grunt-contrib-qunit": "~0.4.0",
"grunt-contrib-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.3",
"grunt-csscomb": "~2.0.1",