Merge branch 'master' into pr/11414

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-11-28 15:55:17 -08:00

parent 0da3901ed5 0be94180b9

commit b5f9cc2057

36 changed files with 176 additions and 323 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

+1 -1

File diff suppressed because one or more lines are too long