aboutsummaryrefslogtreecommitdiff
path: root/package.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-08-23 22:56:23 -0700
committerMark Otto <[email protected]>2013-08-23 22:56:23 -0700
commitb86cd3bc3d866838127e7af15f665c70e7f50847 (patch)
tree0044cbd39cc9927c8a48ca178b019c049520e2ca /package.json
parent22ce6499102c2ab87bbd8a303b5d26531c6e7df2 (diff)
parentd5a27855459325290ace93538f5ceafb22dee27a (diff)
downloadbootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.tar.xz
bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.zip
Merge branch 'master' into deprecate-screen-device-vars
Conflicts: less/variables.less
Diffstat (limited to 'package.json')
-rw-r--r--package.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/package.json b/package.json
index 71f7aa5b4..0bb25e8a0 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,7 @@
, "grunt-contrib-uglify": "~0.2.2"
, "grunt-contrib-qunit": "~0.2.2"
, "grunt-contrib-watch": "~0.5.1"
- , "grunt-html-validation": "git://github.com/praveenvijayan/grunt-html-validation.git"
+ , "grunt-html-validation": "~0.1.4"
, "grunt-jekyll": "~0.3.8"
, "grunt-recess": "~0.3.3"
, "browserstack-runner": "~0.0.11"