git.ipfire.org Git - thirdparty/bootstrap.git/commit

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

author	Mark Otto <markdotto@gmail.com>
	Wed, 17 Sep 2014 22:21:31 +0000 (15:21 -0700)
committer	Mark Otto <markdotto@gmail.com>
	Wed, 17 Sep 2014 22:21:31 +0000 (15:21 -0700)
commit	9f2aeafe851bdca522b886c29afcece1ee0060e1
tree	be13d5ce0d68631543f28af8d9b444a7bd44917e	tree \| snapshot
parent	7d9f55c3d5dcc5b12882af96245dab27be5fa346	commit \| diff
parent	c5c67d0f54674dede58fc924d4d7c0f1d65705d9	commit \| diff

Gruntfile.js	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.css.map	diff1 \|	diff2 \|	blob \| history
dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
docs/_includes/customizer-variables.html	diff1 \|	diff2 \|	blob \| history
docs/_includes/footer.html	diff1 \|	diff2 \|	blob \| history
docs/_includes/nav/customize.html	\|	diff2 \|	blob \| history
docs/assets/css/docs.min.css	diff1 \|	diff2 \|	blob \| history
docs/assets/js/customize.min.js	diff1 \|	diff2 \|	blob \| history
docs/assets/js/raw-files.min.js	diff1 \|	diff2 \|	blob \| history
docs/assets/less/docs.less	diff1 \|	\|	blob \| history
docs/browser-bugs.md	diff1 \|	\|	blob \| history
docs/components/badges.md	diff1 \|	\|	blob \| history
docs/components/dropdowns.md	diff1 \|	\|	blob \| history
docs/components/forms.md	diff1 \|	\|	blob \| history
docs/components/input-group.md	diff1 \|	\|	blob \| history
docs/components/new-navbar.md	diff1 \|	\|	blob \| history
docs/components/pagination.md	diff1 \|	\|	blob \| history
docs/customize.html	diff1 \|	diff2 \|	blob \| history
docs/dist/css/bootstrap.css	diff1 \|	diff2 \|	blob \| history
docs/dist/css/bootstrap.css.map	diff1 \|	diff2 \|	blob \| history
docs/dist/css/bootstrap.min.css	diff1 \|	diff2 \|	blob \| history
docs/examples/blog/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/carousel/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/dashboard/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/jumbotron/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/navbar-fixed-top/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/navbar-static-top/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/navbar/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/non-responsive/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/offcanvas/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/starter-template/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/sticky-footer-navbar/index.html	diff1 \|	diff2 \|	blob \| history
docs/examples/theme/index.html	diff1 \|	diff2 \|	blob \| history
docs/getting-started/compiling.md	diff1 \|	\|	blob \| history
docs/getting-started/support.md	diff1 \|	\|	blob \| history
docs/javascript/alerts.md	diff1 \|	\|	blob \| history
docs/javascript/buttons.md	diff1 \|	\|	blob \| history
docs/javascript/carousel.md	diff1 \|	\|	blob \| history
docs/javascript/collapse.md	diff1 \|	\|	blob \| history
docs/javascript/modal.md	diff1 \|	\|	blob \| history
docs/javascript/popovers.md	diff1 \|	\|	blob \| history
docs/javascript/tooltips.md	diff1 \|	\|	blob \| history
less/_button-group.less	diff1 \|	diff2 \|	blob \| history
less/_dropdown.less	diff1 \|	diff2 \|	blob \| history
less/_forms.less	diff1 \|	diff2 \|	blob \| history
less/_jumbotron.less	diff1 \|	diff2 \|	blob \| history
less/_list-group.less	diff1 \|	diff2 \|	blob \| history
less/_navbar.less	diff1 \|	diff2 \|	blob \| history
less/_pager.less	diff1 \|	diff2 \|	blob \| history
less/_popover.less	diff1 \|	diff2 \|	blob \| history
less/_print.less	diff1 \|	diff2 \|	blob \| history
less/_variables.less	diff1 \|	diff2 \|	blob \| history