Mark Otto be74ad7e0d Merge branch '3.0.0-wip' into bs3-normalize ...

Conflicts:
	less/bootstrap.less

2012-12-20 14:02:54 -08:00

..

bootstrap.css

Merge branch '3.0.0-wip' into bs3-normalize

2012-12-20 14:02:54 -08:00

docs.css

Change .jumbotron usage in docs layout to .bs-docs-jumbotron

2012-12-19 21:42:36 -08:00