diff options
author | Mark Otto <markdotto@gmail.com> | 2014-11-10 09:02:53 +0300 |
---|---|---|
committer | Mark Otto <markdotto@gmail.com> | 2014-11-10 09:02:53 +0300 |
commit | 86af1f39abbff7ef06b94d23951408ca27f81cdc (patch) | |
tree | fdd71d469877a0fdfcaa8ab3d6994463240c40c4 /bower.json | |
parent | 9796f56fa175c41582793a87a1c7eab0f8db1209 (diff) | |
parent | d1278efcc5a6b45467caca15206bb1a83ae99fc5 (diff) |
Merge branch 'master' into derp
Conflicts:
Gruntfile.js
_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
docs/_includes/components/button-groups.html
docs/_includes/components/jumbotron.html
docs/_includes/components/media.html
docs/_includes/components/navs.html
docs/_includes/customizer-variables.html
docs/_includes/footer.html
docs/_includes/getting-started/browser-device-support.html
docs/_includes/js/carousel.html
docs/_includes/js/dropdowns.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/_layouts/default.html
docs/assets/css/docs.min.css
docs/assets/css/src/docs.css
docs/assets/js/customize.min.js
docs/assets/js/docs.min.js
docs/assets/js/raw-files.min.js
docs/browser-bugs.html
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/examples/justified-nav/index.html
less/_forms.less
less/_tooltip.less
less/navs.less
less/theme.less
Diffstat (limited to 'bower.json')
-rw-r--r-- | bower.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bower.json b/bower.json index 7d83763cea..cdcc26fafe 100644 --- a/bower.json +++ b/bower.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.2.0", + "version": "3.3.0", "keywords": [ "css", "js", |