Merge branch '3.0.0-wip' into bs3_homepage

Browse Source

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

...

This commit is contained in:

Mark Otto

2013-08-18 20:15:45 -07:00

parent cf09e6a6b5 f584500211

commit a9378a9267

17 changed files with 179 additions and 179 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

+16 -42

File diff suppressed because one or more lines are too long