Merge branch '3.0.0-wip' into bs3_drop_accordion_for_panel

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-13 10:36:38 -07:00

parent 09b2a153fc 3e373a844c

commit 33a88c9a94

10 changed files with 245 additions and 134 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