Mark Otto 06f1293acf Merge branch 'master' into panels_and_tables ...

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

2014-02-07 18:36:27 -08:00

..

bootstrap-theme.css

Bump versions, run grunt

2014-01-30 08:30:37 -08:00

bootstrap-theme.css.map

Fixes #12555: Rearrange variables to place grids and containers closer

2014-02-07 01:22:30 -08:00

bootstrap-theme.min.css

Bump versions, run grunt

2014-01-30 08:30:37 -08:00

bootstrap.css

Merge branch 'master' into panels_and_tables

2014-02-07 18:36:27 -08:00

bootstrap.css.map

Merge branch 'master' into panels_and_tables

2014-02-07 18:36:27 -08:00

bootstrap.min.css

Merge branch 'master' into panels_and_tables

2014-02-07 18:36:27 -08:00