Merge branch 'master' into pr/11536

Browse Source

Conflicts:
	dist/css/bootstrap.min.css

...

This commit is contained in:

Mark Otto

2013-11-30 23:35:56 -08:00

parent ba4c5dae9b 57070dcf45

commit 53047fa587

47 changed files with 799 additions and 842 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