0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Mark Otto 7e29581210 Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
2012-09-07 22:34:51 -07:00
..