Merge branch '3.0.0-wip' into glyphicons-LESS-fixes

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-18 15:47:29 -07:00

parent fa7cc6cafd 638db635d7

commit c240460f0b

16 changed files with 356 additions and 263 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