]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into derp
authorMark Otto <markdotto@gmail.com>
Mon, 10 Nov 2014 06:02:53 +0000 (22:02 -0800)
committerMark Otto <markdotto@gmail.com>
Mon, 10 Nov 2014 06:02:53 +0000 (22:02 -0800)
commit86af1f39abbff7ef06b94d23951408ca27f81cdc
treefdd71d469877a0fdfcaa8ab3d6994463240c40c4
parent9796f56fa175c41582793a87a1c7eab0f8db1209
parentd1278efcc5a6b45467caca15206bb1a83ae99fc5
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
35 files changed:
Gruntfile.js
_config.yml
bower.json
docs/_includes/footer.html
docs/_includes/header.html
docs/assets/js/src/application.js
docs/assets/less/docs.less
docs/browser-bugs.md
docs/components/button-group.md
docs/components/jumbotron.md
docs/examples/blog/index.html
docs/examples/jumbotron-narrow/index.html
docs/examples/jumbotron/index.html
docs/examples/justified-nav/index.html
docs/examples/sticky-footer-navbar/index.html
docs/examples/sticky-footer/index.html
docs/getting-started/support.md
docs/javascript/dropdowns.md
docs/javascript/modal.md
docs/javascript/popovers.md
docs/javascript/tooltips.md
docs/layout/media.md
less/_badge.less
less/_buttons.less
less/_dropdown.less
less/_forms.less
less/_list-group.less
less/_modal.less
less/_nav.less
less/_navbar.less
less/_pager.less
less/_pagination.less
less/_popover.less
less/_tooltip.less
less/_variables.less