diff options
| author | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-09-17 15:21:31 -0700 |
| commit | 9f2aeafe851bdca522b886c29afcece1ee0060e1 (patch) | |
| tree | be13d5ce0d68631543f28af8d9b444a7bd44917e /package.json | |
| parent | 7d9f55c3d5dcc5b12882af96245dab27be5fa346 (diff) | |
| parent | c5c67d0f54674dede58fc924d4d7c0f1d65705d9 (diff) | |
| download | bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.tar.xz bootstrap-9f2aeafe851bdca522b886c29afcece1ee0060e1.zip | |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
dist/css/bootstrap-theme.css.map
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/fonts/glyphicons-halflings-regular.svg
docs/_includes/components/badges.html
docs/_includes/components/input-groups.html
docs/_includes/components/pagination.html
docs/_includes/css/forms.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/getting-started/grunt.html
docs/_includes/home-nav.html
docs/_includes/js/alerts.html
docs/_includes/js/buttons.html
docs/_includes/js/carousel.html
docs/_includes/js/collapse.html
docs/_includes/js/modal.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/_includes/nav/getting-started.html
docs/_includes/nav/javascript.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/fonts/glyphicons-halflings-regular.svg
fonts/glyphicons-halflings-regular.svg
less/_button-group.less
less/_jumbotron.less
less/_variables.less
less/mixins/vendor-prefixes.less
less/panels.less
less/thumbnails.less
package.json
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/package.json b/package.json index 90c48274b..66c5df861 100644 --- a/package.json +++ b/package.json @@ -31,34 +31,33 @@ }, "devDependencies": { "btoa": "~1.1.2", - "glob": "~4.0.4", + "glob": "~4.0.5", "grunt": "~0.4.5", - "grunt-autoprefixer": "~0.8.2", + "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-csslint": "~0.3.1", "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-less": "~0.11.4", "grunt-contrib-qunit": "~0.5.2", - "grunt-contrib-uglify": "~0.5.0", + "grunt-contrib-uglify": "~0.5.1", "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": "~0.6.1", - "grunt-lesslint": "~0.17.0", - "grunt-saucelabs": "~8.2.0", + "grunt-jscs": "~0.7.1", + "grunt-saucelabs": "~8.3.2", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~0.6.0", "markdown": "~0.5.0", - "npm-shrinkwrap": "~3.1.6", - "time-grunt": "~0.4.0" + "npm-shrinkwrap": "~3.1.8", + "time-grunt": "~1.0.0" }, "engines": { "node": "~0.10.1" |