0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-30 22:52:24 +01:00

Merge branch 'master' into docs_dir

This commit is contained in:
Mark Otto 2013-12-31 13:43:11 -08:00
commit 05cc208333

View File

@ -30,7 +30,7 @@
"grunt-banner": "~0.2.0", "grunt-banner": "~0.2.0",
"grunt-contrib-clean": "~0.5.0", "grunt-contrib-clean": "~0.5.0",
"grunt-contrib-concat": "~0.3.0", "grunt-contrib-concat": "~0.3.0",
"grunt-contrib-connect": "~0.5.0", "grunt-contrib-connect": "~0.6.0",
"grunt-contrib-copy": "~0.5.0", "grunt-contrib-copy": "~0.5.0",
"grunt-contrib-csslint": "~0.2.0", "grunt-contrib-csslint": "~0.2.0",
"grunt-contrib-jshint": "~0.8.0", "grunt-contrib-jshint": "~0.8.0",
@ -38,7 +38,7 @@
"grunt-contrib-qunit": "~0.3.0", "grunt-contrib-qunit": "~0.3.0",
"grunt-contrib-uglify": "~0.2.7", "grunt-contrib-uglify": "~0.2.7",
"grunt-contrib-watch": "~0.5.3", "grunt-contrib-watch": "~0.5.3",
"grunt-csscomb": "~1.2.1", "grunt-csscomb": "~2.0.1",
"grunt-html-validation": "~0.1.13", "grunt-html-validation": "~0.1.13",
"grunt-jekyll": "~0.4.1", "grunt-jekyll": "~0.4.1",
"grunt-jscs-checker": "~0.3.0", "grunt-jscs-checker": "~0.3.0",