bootstrap/docs/templates
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
..
pages Merge branch '2.1.2-wip' into exploratory 2012-10-01 23:41:00 -07:00
layout.mustache initial pass at removing navbar-inner from .navbar component 2012-09-25 22:48:02 -07:00