diff options
| author | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-18 12:24:29 -0800 |
| commit | 1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f (patch) | |
| tree | 7a63ae1a434fae8cb51835fafd1b531d5f5da64e /package.json | |
| parent | dbe47654160d389c6991a312c9cecd2eeb9b6122 (diff) | |
| parent | 22b79dae3c9307c329e6722ff1be8aa0a4143812 (diff) | |
| download | bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.tar.xz bootstrap-1bf1ba7103cf4de0364dfd8ec78a31eb813d7b8f.zip | |
Merge branch 'master' into pr/15278
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/package.json b/package.json index 5793ad2d4..36490e847 100644 --- a/package.json +++ b/package.json @@ -32,32 +32,33 @@ }, "devDependencies": { "btoa": "~1.1.2", - "glob": "~4.2.1", + "glob": "~4.3.5", "grunt": "~0.4.5", - "grunt-autoprefixer": "~2.0.0", - "grunt-banner": "~0.2.3", + "grunt-autoprefixer": "~2.1.0", + "grunt-banner": "~0.3.1", "grunt-contrib-clean": "~0.6.0", + "grunt-contrib-compress": "~0.13.0", "grunt-contrib-concat": "~0.5.0", "grunt-contrib-connect": "~0.9.0", "grunt-contrib-copy": "~0.7.0", "grunt-contrib-csslint": "~0.3.1", - "grunt-contrib-cssmin": "~0.10.0", - "grunt-contrib-jade": "~0.13.0", + "grunt-contrib-cssmin": "~0.11.0", + "grunt-contrib-jade": "~0.14.0", "grunt-contrib-jshint": "~0.10.0", - "grunt-contrib-less": "~0.12.0", + "grunt-contrib-less": "~1.0.0", "grunt-contrib-qunit": "~0.5.2", - "grunt-contrib-uglify": "~0.6.0", + "grunt-contrib-uglify": "~0.7.0", "grunt-contrib-watch": "~0.6.1", "grunt-csscomb": "~3.0.0", "grunt-exec": "~0.4.6", "grunt-html-validation": "~0.1.18", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~1.0.0", - "grunt-saucelabs": "~8.3.3", + "grunt-jscs": "~1.2.0", + "grunt-saucelabs": "~8.4.1", "grunt-sed": "~0.1.1", - "load-grunt-tasks": "~1.0.0", - "npm-shrinkwrap": "5.0.0", - "remarkable": "~1.4.2", + "load-grunt-tasks": "~2.0.0", + "npm-shrinkwrap": "^200.0.0", + "remarkable": "~1.6.0", "time-grunt": "~1.0.0" }, "engines": { |