Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Browse Source

Conflicts:
	_layouts/customize.html

...

This commit is contained in:

Jacob Thornton

2013-08-07 23:10:11 -07:00

parent b35b65d0b3 f3104a3e3b

commit 89b69ed770

34 changed files with 495 additions and 200 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

+2 -2

File diff suppressed because one or more lines are too long