diff options
| author | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
|---|---|---|
| committer | James Friend <[email protected]> | 2014-08-28 09:32:08 +0800 |
| commit | 9aeaf19b1dca68ee71e916ae415a0c270a47d301 (patch) | |
| tree | bc8385acb8ec7a46bba03ff2ef7e4283cd9f1146 /package.json | |
| parent | e7991a9a1e2f474c8f1d8a2e0ed113816f1c5e82 (diff) | |
| parent | 35f09315ed543a0479719afa2143240952c215db (diff) | |
| download | bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.tar.xz bootstrap-9aeaf19b1dca68ee71e916ae415a0c270a47d301.zip | |
Merge remote-tracking branch 'upstream/master' into node-requirable
Conflicts:
Gruntfile.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/package.json b/package.json index 6f15315b4..38d5d3b7d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "3.1.1", + "version": "3.2.0", "keywords": [ "css", "less", @@ -31,34 +31,34 @@ "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" }, "devDependencies": { - "btoa": "~1.1.1", - "canonical-json": "~0.0.4", - "glob": "^4.0.0", - "grunt": "~0.4.4", - "grunt-autoprefixer": "~0.7.2", - "grunt-banner": "~0.2.2", - "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-concat": "~0.4.0", + "btoa": "~1.1.2", + "glob": "~4.0.5", + "grunt": "~0.4.5", + "grunt-autoprefixer": "~1.0.1", + "grunt-banner": "~0.2.3", + "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-concat": "~0.5.0", "grunt-contrib-connect": "~0.8.0", "grunt-contrib-copy": "~0.5.0", "grunt-contrib-csslint": "~0.2.0", - "grunt-contrib-cssmin": "~0.9.0", + "grunt-contrib-cssmin": "~0.10.0", "grunt-contrib-jade": "~0.12.0", "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-less": "~0.11.0", - "grunt-contrib-qunit": "~0.5.1", - "grunt-contrib-uglify": "~0.4.0", + "grunt-contrib-less": "~0.11.4", + "grunt-contrib-qunit": "~0.5.2", + "grunt-contrib-uglify": "~0.5.1", "grunt-contrib-watch": "~0.6.1", - "grunt-csscomb": "~2.0.1", - "grunt-exec": "~0.4.5", - "grunt-html-validation": "~0.1.15", - "grunt-jekyll": "~0.4.1", - "grunt-jscs-checker": "~0.4.3", - "grunt-saucelabs": "~8.0.2", + "grunt-csscomb": "~3.0.0", + "grunt-exec": "~0.4.6", + "grunt-html-validation": "~0.1.18", + "grunt-jekyll": "~0.4.2", + "grunt-jscs": "~0.6.2", + "grunt-saucelabs": "~8.3.1", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.5.0", + "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", - "time-grunt": "~0.3.1" + "npm-shrinkwrap": "~3.1.8", + "time-grunt": "~1.0.0" }, "engines": { "node": "~0.10.1" |