]> git.ipfire.org Git - thirdparty/bootstrap.git/commit
Merge branch '2.2.3' into 3.0.0-wip
authorMark Otto <otto@github.com>
Thu, 20 Dec 2012 08:02:52 +0000 (00:02 -0800)
committerMark Otto <otto@github.com>
Thu, 20 Dec 2012 08:02:52 +0000 (00:02 -0800)
commit3e64d03731643cdf0a64e6ec5891ab78f3d8d614
treeb06703976036986af7decffd714ef2f89f3bac3b
parentcb67366206b318c183b00f6bc6f30652518147b8
parent312509e1c0d34b75e3c3bc769c77015efe5106c0
Merge branch '2.2.3' into 3.0.0-wip

Conflicts:
Makefile
README.md
component.json
docs/assets/css/bootstrap-responsive.css
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-transition.js
docs/assets/js/bootstrap-typeahead.js
docs/assets/js/bootstrap.js
docs/assets/js/bootstrap.min.js
docs/index.html
docs/templates/pages/base-css.mustache
docs/templates/pages/index.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-transition.js
js/bootstrap-typeahead.js
less/bootstrap.less
less/responsive.less
less/type.less
package.json