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

..

bootstrap-responsive.css

Merge branch 'new_grid' into 2.0.2-wip

2012-03-10 12:41:41 -08:00

bootstrap.css

Merge branch 'new_grid' into 2.0.2-wip

2012-03-10 12:41:41 -08:00

docs.css

add version to docs homepage, fix docs example for forms

2012-02-24 21:02:24 -08:00