diff options
| author | Mark Otto <[email protected]> | 2013-12-31 13:53:33 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-12-31 13:53:33 -0800 |
| commit | b253cb2c1e34a41940c4933fb95c46da833fc5f9 (patch) | |
| tree | e5a40b963eba273c42e4aad21fb3858a657002dd /package.json | |
| parent | 9e1153d0498a9e9612c1db85922642fe2aa38c2a (diff) | |
| parent | 8812856de1ce17bb2f482c75370fb2e3db7ac6de (diff) | |
| download | bootstrap-b253cb2c1e34a41940c4933fb95c46da833fc5f9.tar.xz bootstrap-b253cb2c1e34a41940c4933fb95c46da833fc5f9.zip | |
Merge branch 'master' into docs_derp
Conflicts:
_config.yml
docs/_includes/footer.html
docs/_includes/nav-main.html
docs/_includes/old-bs-docs.html
docs/_layouts/default.html
docs/_layouts/home.html
docs/getting-started.html
docs/index.html
Diffstat (limited to 'package.json')
| -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", |