Merge branch 'master' into docs_derp

Browse Source

Conflicts:
	docs/assets/css/pack.min.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js

...

This commit is contained in:

Mark Otto

2014-01-13 22:43:18 -08:00

parent b17dca240e 8c0cb806c6

commit eca81939cc

15 changed files with 168 additions and 76 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/assets/js/docs.min.js

Vendored

+11 -2

File diff suppressed because one or more lines are too long