Merge branch 'glyphicons_font' into exploratory

Browse Source

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

...

This commit is contained in:

Mark Otto

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

parent c0eacca0db 4b3fb30877

commit a56de2b84f

25 changed files with 1436 additions and 903 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

docs/assets/css/bootstrap.css

Vendored

+381 -321

File diff suppressed because it is too large Load Diff