Jacob Thornton 1fd5e55881 Merge branch '2.0.2-wip' of github.com:twitter/bootstrap into 2.0.2-wip ... Conflicts: docs/assets/bootstrap.zip docs/assets/css/bootstrap-responsive.css docs/assets/css/bootstrap.css		2012-03-10 12:42:39 -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 12:42:39 -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