0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Jacob Thornton 1a8d7576e0 Merge branch 'new_grid' into 2.0.2-wip
Conflicts:
	docs/assets/bootstrap.zip
	docs/assets/css/bootstrap-responsive.css
	docs/assets/css/bootstrap.css
	less/mixins.less
2012-03-10 12:41:41 -08:00
..
2012-03-08 11:39:50 -08:00