Merge branch 'master' into thumbnail-extend

Browse Source

Conflicts:
	dist/css/bootstrap.css

...

This commit is contained in:

Mark Otto

2014-02-06 18:52:03 -08:00

parent fda8d91c86 596495c89b

commit ace0abfdb6

6 changed files with 8 additions and 9 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.css.map vendored

File diff suppressed because one or more lines are too long