0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-03 15:24:19 +01:00
Bootstrap/docs/templates
Mark Otto fca35c0dba Merge branch '2.2.2-wip' into exploratory
Conflicts:
	docs/assets/css/bootstrap.css
	docs/components.html
	docs/templates/pages/components.mustache
	less/alerts.less
	less/button-groups.less
	less/buttons.less
	less/tests/css-tests.html
2012-11-30 00:13:30 -08:00
..
pages Merge branch '2.2.2-wip' into exploratory 2012-11-30 00:13:30 -08:00
layout.mustache Merge branch '2.2.2-wip' into exploratory 2012-11-30 00:13:30 -08:00