Mark Otto f7d4fb61ce Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip ... Conflicts: docs/assets/bootstrap.zip		2012-03-10 14:12:29 -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 '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip	2012-03-10 14:12:29 -08:00
docs.css	fix the font-family var by using inherit instead of empty string, fix font-weight in docs for jumbotron	2012-03-10 11:27:07 -08:00