Mark Otto 46c3d27468 Merge branch 'master' into pr/11435 ...

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css

2013-12-14 16:56:56 -08:00

..

bootstrap-theme.css

more closely align property order with recess

2013-12-08 22:55:09 -08:00

bootstrap-theme.min.css

Undo merge of #11778 and use cleancss min option

2013-12-09 00:12:11 -08:00

bootstrap.css

Merge branch 'master' into pr/11435

2013-12-14 16:56:56 -08:00

bootstrap.min.css

Merge branch 'master' into pr/11435

2013-12-14 16:56:56 -08:00