Mark Otto 421f9f67c4 Merge branch '2.3.0-wip' into 3.0.0-wip ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/js/bootstrap-popover.js
	docs/assets/js/bootstrap.js
	docs/css.html
	docs/templates/pages/base-css.mustache
	js/bootstrap-popover.js
	less/mixins.less
	less/tooltip.less

2013-02-05 22:42:54 -08:00

4.6 KiB

Raw Blame History

View Raw