Merge branch '3.0.0-wip' into bs3_restore_glyphicons

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-18 10:28:32 -07:00

parent 6b24297c5b 6496ffb7d4

commit f8b65b41ab

11 changed files with 381 additions and 76 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

2

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long