diff options
| author | Mark Otto <[email protected]> | 2015-01-19 14:48:12 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-19 14:48:12 -0800 |
| commit | 325748ff6860fbafaac21e3bfbaabfdb05fa71a8 (patch) | |
| tree | 0fc4e65149990e9d59029c09e24a0242ffa8a2d0 /package.json | |
| parent | 0964504fdafdde0ac71ab1a6f65eea1686cef9f8 (diff) | |
| parent | 4fd01b7ac130dd815e7490950ed807487b684f4a (diff) | |
| download | bootstrap-325748ff6860fbafaac21e3bfbaabfdb05fa71a8.tar.xz bootstrap-325748ff6860fbafaac21e3bfbaabfdb05fa71a8.zip | |
Merge branch 'master' into v4
Conflicts:
_config.yml
dist/css/bootstrap-theme.css
dist/css/bootstrap-theme.css.map
dist/css/bootstrap-theme.min.css
dist/css/bootstrap.css
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
dist/js/bootstrap.min.js
docs/_includes/components/thumbnails.html
docs/_includes/css/forms.html
docs/_includes/css/grid.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/download.html
docs/_includes/getting-started/template.html
docs/_includes/js/overview.html
docs/_includes/js/popovers.html
docs/_includes/js/tooltips.html
docs/assets/css/docs.min.css
docs/assets/js/customize.min.js
docs/assets/js/raw-files.min.js
docs/assets/js/src/customizer.js
docs/dist/css/bootstrap-theme.css
docs/dist/css/bootstrap-theme.css.map
docs/dist/css/bootstrap-theme.min.css
docs/dist/css/bootstrap.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
docs/dist/js/bootstrap.js
docs/dist/js/bootstrap.min.js
docs/examples/navbar-fixed-top/index.html
docs/examples/navbar-static-top/index.html
docs/examples/non-responsive/index.html
docs/examples/theme/index.html
grunt/configBridge.json
less/alerts.less
less/badges.less
less/jumbotron.less
less/panels.less
less/tables.less
less/theme.less
less/variables.less
package.json
scss/_button-group.scss
scss/_buttons.scss
scss/_forms.scss
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/package.json b/package.json index c6295a079..e8a25e111 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.3.1", + "version": "4.0.0-alpha", "keywords": [ "css", "sass", @@ -32,16 +32,16 @@ }, "devDependencies": { "btoa": "~1.1.2", - "glob": "~4.3.1", + "glob": "~4.3.5", "grunt": "~0.4.5", - "grunt-autoprefixer": "~2.0.0", - "grunt-banner": "~0.2.3", + "grunt-autoprefixer": "~2.2.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-csslint": "~0.4.0", "grunt-contrib-cssmin": "~0.11.0", "grunt-contrib-jade": "~0.14.0", "grunt-contrib-jshint": "~0.10.0", @@ -53,9 +53,9 @@ "grunt-exec": "~0.4.6", "grunt-html-validation": "~0.1.18", "grunt-jekyll": "~0.4.2", - "grunt-jscs": "~1.1.0", + "grunt-jscs": "~1.2.0", "grunt-sass": "~0.17.0", - "grunt-saucelabs": "~8.4.0", + "grunt-saucelabs": "~8.4.1", "grunt-scss-lint": "^0.3.4", "grunt-sed": "~0.1.1", "load-grunt-tasks": "~2.0.0", |