Merge branch 'master' into pr/11162

Browse Source

Conflicts:
	less/modals.less

...

This commit is contained in:

Mark Otto

2013-12-14 16:29:47 -08:00

parent 89e0f1669f 83c60ef3ee

commit 323a40cc53

129 changed files with 6010 additions and 4737 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

+4 -4

File diff suppressed because one or more lines are too long