diff options
| author | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-07 22:10:22 -0700 |
| commit | 81b59d35368bc51d361d0352cc92fe99dc580fbf (patch) | |
| tree | 2395d5e79edaaa8c0a7ad82e99931ec895421532 /package.json | |
| parent | fed2b0f7eb78438eb1b768782b04651881d88740 (diff) | |
| parent | ddee04038f946ac103eb4e70c8eb7adeb2cf563b (diff) | |
| download | bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.tar.xz bootstrap-81b59d35368bc51d361d0352cc92fe99dc580fbf.zip | |
Merge branch 'master' into derp
Conflicts:
docs/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/docs.min.js
docs/assets/js/src/application.js
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/package.json b/package.json index c6fa72b93..234490b55 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", @@ -30,34 +30,34 @@ "url": "https://github.com/twbs/bootstrap/blob/master/LICENSE" }, "devDependencies": { - "btoa": "~1.1.1", - "canonical-json": "~0.0.4", - "grunt": "~0.4.4", - "grunt-autoprefixer": "~0.7.2", - "grunt-banner": "~0.2.2", + "btoa": "~1.1.2", + "glob": "~4.0.3", + "grunt": "~0.4.5", + "grunt-autoprefixer": "~0.8.1", + "grunt-banner": "~0.2.3", "grunt-contrib-clean": "~0.5.0", - "grunt-contrib-concat": "~0.3.0", - "grunt-contrib-connect": "~0.7.1", + "grunt-contrib-concat": "~0.4.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-jade": "~0.11.0", - "grunt-contrib-jshint": "~0.9.2", - "grunt-contrib-less": "~0.10.0", - "grunt-contrib-qunit": "~0.4.0", - "grunt-contrib-uglify": "~0.4.0", - "grunt-contrib-watch": "~0.6.0", + "grunt-contrib-cssmin": "~0.10.0", + "grunt-contrib-jade": "~0.12.0", + "grunt-contrib-jshint": "~0.10.0", + "grunt-contrib-less": "~0.11.3", + "grunt-contrib-qunit": "~0.5.1", + "grunt-contrib-uglify": "~0.5.0", + "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~2.0.1", - "grunt-css-flip": "~0.2.1", "grunt-exec": "~0.4.5", - "grunt-html-validation": "~0.1.13", - "grunt-jekyll": "~0.4.1", - "grunt-jscs-checker": "~0.4.0", - "grunt-saucelabs": "~5.1.0", + "grunt-html-validation": "~0.1.18", + "grunt-jekyll": "~0.4.2", + "grunt-jscs": "~0.6.1", + "grunt-saucelabs": "~8.1.1", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~0.4.0", + "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", - "time-grunt": "~0.2.10" + "npm-shrinkwrap": "~3.1.6", + "time-grunt": "~0.3.2" }, "engines": { "node": "~0.10.1" |