Merge branch 'master' into pr/11750

Browse Source

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

...

This commit is contained in:

Mark Otto

2013-12-08 01:45:42 -08:00

parent b92bee99ef 475bbd4d38

commit 12500047f9

46 changed files with 2012 additions and 1028 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

dist/css/bootstrap.min.css

Vendored

+1 -1

File diff suppressed because one or more lines are too long