Mark Otto ce19e63d5b Merge branch '2.1.2-wip' into box-sizing-exercise ...

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

2012-09-25 22:00:41 -07:00

8.4 KiB

Raw Blame History

View Raw