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

1 files changed, 19 insertions, 14 deletions

diff --git a/package.json b/package.json
index d7940d290..2379ed6dd 100644
--- a/package.json
+++ b/package.json
@@ -32,34 +32,35 @@
   },
   "devDependencies": {
     "btoa": "~1.1.2",
-    "glob": "~5.0.3",
+    "glob": "~5.0.5",
     "grunt": "~0.4.5",
-    "grunt-autoprefixer": "~2.2.0",
+    "grunt-autoprefixer": "~3.0.0",
     "grunt-banner": "~0.3.1",
     "grunt-contrib-clean": "~0.6.0",
     "grunt-contrib-compress": "~0.13.0",
     "grunt-contrib-concat": "~0.5.1",
-    "grunt-contrib-connect": "~0.9.0",
+    "grunt-contrib-connect": "~0.10.1",
     "grunt-contrib-copy": "~0.8.0",
     "grunt-contrib-csslint": "~0.4.0",
     "grunt-contrib-cssmin": "~0.12.2",
+    "grunt-contrib-htmlmin": "~0.4.0",
     "grunt-contrib-jade": "~0.14.1",
-    "grunt-contrib-jshint": "~0.11.0",
-    "grunt-contrib-less": "~1.0.0",
-    "grunt-contrib-qunit": "~0.5.2",
-    "grunt-contrib-uglify": "~0.8.0",
+    "grunt-contrib-jshint": "~0.11.2",
+    "grunt-contrib-less": "~1.0.1",
+    "grunt-contrib-qunit": "~0.7.0",
+    "grunt-contrib-uglify": "~0.9.1",
     "grunt-contrib-watch": "~0.6.1",
     "grunt-csscomb": "~3.0.0",
     "grunt-exec": "~0.4.6",
-    "grunt-html": "~4.0.1",
+    "grunt-html": "~4.0.2",
     "grunt-jekyll": "~0.4.2",
-    "grunt-jscs": "~1.5.0",
-    "grunt-saucelabs": "~8.6.0",
-    "grunt-sed": "~0.1.1",
+    "grunt-jscs": "~1.6.0",
+    "grunt-saucelabs": "~8.6.1",
+    "grunt-sed": "twbs/grunt-sed#v0.2.0",
     "load-grunt-tasks": "~3.1.0",
-    "markdown-it": "^4.0.1",
+    "markdown-it": "^4.1.1",
     "npm-shrinkwrap": "^200.1.0",
-    "time-grunt": "^1.1.0"
+    "time-grunt": "^1.1.1"
   },
   "engines": {
     "node": ">=0.10.1"
@@ -82,6 +83,10 @@
         "exports": "$"
       }
     },
-    "files": ["css", "fonts", "js"]
+    "files": [
+      "css",
+      "fonts",
+      "js"
+    ]
   }
 }