Mark Otto d2f1887bb5 Merge branch 'master' into pr/12388 ...

Conflicts:
	dist/css/bootstrap.min.css

2014-01-29 22:18:29 -08:00

..

bootstrap-theme.css.map

Fix #12422: Reset height on multiple select in input size mixin

2014-01-29 21:34:10 -08:00

bootstrap-theme.min.css

Fix #12073: Consistent order of variations

2014-01-07 22:24:45 +01:00

bootstrap.css.map

Merge branch 'master' into pr/12388

2014-01-29 22:18:29 -08:00

bootstrap.min.css

Merge branch 'master' into pr/12388

2014-01-29 22:18:29 -08:00