Merge branch 'master' into move-inline-css

Browse Source

Conflicts:
	docs/assets/css/docs.min.css

...

This commit is contained in:

Mark Otto

2015-01-21 20:16:08 -08:00

parent 53d2abff92 c64c863637

commit a3890a72cf

21 changed files with 179 additions and 18 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

docs/dist/css/bootstrap.css.map

Vendored

+1 -1

File diff suppressed because one or more lines are too long