Merge branch 'master' into pr/11868

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-12-14 11:36:54 -08:00

parent 37b2c8a812 22820d7151

commit ecc6f4e6bc

7 changed files with 113 additions and 5 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

2

dist/css/bootstrap.min.css vendored

File diff suppressed because one or more lines are too long