]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch 'master' into 3.0.0-wip
authorMark Otto <otto@github.com>
Sun, 9 Dec 2012 01:40:42 +0000 (17:40 -0800)
committerMark Otto <otto@github.com>
Sun, 9 Dec 2012 01:40:42 +0000 (17:40 -0800)
commitbc0b94a3fdc8fe480c74f4494073e2c0addb265e
treee13fec2ed829b4586fa4044fffc8dbfadddae54e
parentbe5f31480b53555c492e0077c8bb9f419fc48f62
parent9376a7c221a64c2bf508d02ea2ccd85748d10fcc
Merge branch 'master' into 3.0.0-wip

Conflicts:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap.js
docs/css.html
docs/templates/pages/base-css.mustache
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
less/breadcrumbs.less
less/tables.less
less/tests/css-tests.html
35 files changed:
docs/assets/css/bootstrap.css
docs/assets/js/bootstrap-affix.js
docs/assets/js/bootstrap-alert.js
docs/assets/js/bootstrap-button.js
docs/assets/js/bootstrap-carousel.js
docs/assets/js/bootstrap-collapse.js
docs/assets/js/bootstrap-dropdown.js
docs/assets/js/bootstrap-modal.js
docs/assets/js/bootstrap-popover.js
docs/assets/js/bootstrap-scrollspy.js
docs/assets/js/bootstrap-tab.js
docs/assets/js/bootstrap-tooltip.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/components.html
docs/javascript.html
docs/templates/pages/components.mustache
docs/templates/pages/javascript.mustache
js/bootstrap-affix.js
js/bootstrap-alert.js
js/bootstrap-button.js
js/bootstrap-carousel.js
js/bootstrap-collapse.js
js/bootstrap-dropdown.js
js/bootstrap-modal.js
js/bootstrap-popover.js
js/bootstrap-scrollspy.js
js/bootstrap-tab.js
js/bootstrap-tooltip.js
js/bootstrap-typeahead.js
less/buttons.less
less/code.less
less/tables.less
less/tests/css-tests.html