Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Browse Source

Conflicts:
	components.html
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-12 21:34:55 -07:00

parent 8bb7def26c 49576704ea

commit 80eb09cc1b

9 changed files with 92 additions and 80 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