diff options
| author | Mark Otto <[email protected]> | 2013-12-31 13:43:11 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-31 13:43:11 -0800 |
| commit | 05cc208333cdffd95929b10e84ef5a2519dc52c7 (patch) | |
| tree | e1c69152a87c1a15c5eeb8487b7ac5b94e3eb470 | |
| parent | ac3f48bb19a91f1bf23aa5838e11acd62f741b0f (diff) | |
| parent | 295736aff2d9698870d7bc2c1787ec0b1f9f9f30 (diff) | |
| download | bootstrap-05cc208333cdffd95929b10e84ef5a2519dc52c7.tar.xz bootstrap-05cc208333cdffd95929b10e84ef5a2519dc52c7.zip | |
Merge branch 'master' into docs_dir
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 8f471206f..34a3fa5c2 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "grunt-banner": "~0.2.0", "grunt-contrib-clean": "~0.5.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-csslint": "~0.2.0", "grunt-contrib-jshint": "~0.8.0", @@ -38,7 +38,7 @@ "grunt-contrib-qunit": "~0.3.0", "grunt-contrib-uglify": "~0.2.7", "grunt-contrib-watch": "~0.5.3", - "grunt-csscomb": "~1.2.1", + "grunt-csscomb": "~2.0.1", "grunt-html-validation": "~0.1.13", "grunt-jekyll": "~0.4.1", "grunt-jscs-checker": "~0.3.0", |