Mark Otto 4ab7b77aa3 Merge branch '2.1.2-wip' into exploratory ...

Conflicts:
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/labels-badges.less
	less/navbar.less
	less/tables.less

2012-10-01 23:41:00 -07:00

..

bootstrap-responsive.css

single CSS file for all css, including responsive

2012-09-30 23:24:07 -07:00

bootstrap.css

Merge branch '2.1.2-wip' into exploratory

2012-10-01 23:41:00 -07:00

docs.css

Merge branch '2.1.2-wip' into exploratory

2012-10-01 11:27:40 -07:00