Merge branch 'master' into pr/10951

Browse Source

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

...

This commit is contained in:

Mark Otto

2013-12-14 15:38:21 -08:00

parent 80e8644230 f1869771bc

commit a54dbfdf2a

141 changed files with 7385 additions and 5116 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