Merge branch '3.0.0-wip' into bs3_navbar_overhaul

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-13 13:48:33 -07:00

parent 3c772b1ceb a8769b8cab

commit bd93ed2cb6

24 changed files with 577 additions and 310 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