Merge branch 'master' into pr/11412

Browse Source

Conflicts:
	dist/js/bootstrap.min.js

...

This commit is contained in:

Mark Otto

2013-12-01 20:27:30 -08:00

parent 1444a3ca63 561aff7942

commit 4876cbeef8

68 changed files with 1029 additions and 997 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

6

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long