Mark Otto a56de2b84f Merge branch 'glyphicons_font' into exploratory ...

Conflicts:
	docs/assets/css/bootstrap.css
	docs/assets/css/docs.css
	less/sprites.less

2012-11-03 16:15:54 -07:00

..

bootstrap-responsive.css

2.2.1 - hotfix for carousel

2012-10-30 21:59:56 -07:00

bootstrap.css

Merge branch 'glyphicons_font' into exploratory

2012-11-03 16:15:54 -07:00

docs.css

Merge branch 'glyphicons_font' into exploratory

2012-11-03 16:15:54 -07:00