Merge branch 'master' of github.com:twbs/bootstrap

twbs · Jun 23, 2014 · 9da127a · 9da127a
2 parents ca54cff + 8983286
commit 9da127a
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -33,7 +33,7 @@
     "btoa": "~1.1.2",
     "glob": "~4.0.2",
     "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~0.7.5",
+    "grunt-autoprefixer": "~0.7.6",
     "grunt-banner": "~0.2.3",
     "grunt-contrib-clean": "~0.5.0",
     "grunt-contrib-concat": "~0.4.0",
@@ -43,7 +43,7 @@
     "grunt-contrib-cssmin": "~0.10.0",
     "grunt-contrib-jade": "~0.12.0",
     "grunt-contrib-jshint": "~0.10.0",
-    "grunt-contrib-less": "~0.11.2",
+    "grunt-contrib-less": "~0.11.3",
     "grunt-contrib-qunit": "~0.5.1",
     "grunt-contrib-uglify": "~0.5.0",
     "grunt-contrib-watch": "~0.6.1",
@@ -54,9 +54,9 @@
     "grunt-jscs-checker": "~0.5.1",
     "grunt-saucelabs": "~8.0.2",
     "grunt-sed": "~0.1.1",
-    "load-grunt-tasks": "~0.5.0",
+    "load-grunt-tasks": "~0.6.0",
     "markdown": "~0.5.0",
-    "npm-shrinkwrap": "~3.1.4",
+    "npm-shrinkwrap": "~3.1.6",
     "time-grunt": "~0.3.2"
   },
   "engines": {

diff --git a/test-infra/npm-shrinkwrap.json b/test-infra/npm-shrinkwrap.json