Merge branch '3.0.0-wip' into bs3_panel_base_class

Browse Source

Conflicts:
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-08-18 20:11:04 -07:00

parent 0615142834 2e91843661

commit a1db2d7a5e

13 changed files with 74 additions and 86 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

customize.html

+1 -13

File diff suppressed because one or more lines are too long