Merge branch 'master' into pr/11744

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-12-08 02:00:37 -08:00

parent b5008ebf9c e43e87b2f3

commit c37b710e85

40 changed files with 2020 additions and 1037 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