Geoffrey Booth 57ffe14fab Merge branch 'master' into 2 ...

# Conflicts:
#	Cakefile
#	package.json

2016-11-17 22:00:36 -08:00

..

annotated-source

Update cake doc:source to output to new docs/v{1|2}/annotated-source; collapse doc:underscore into it and generate missing underscore.html (closes #4295)

2016-11-15 21:16:13 -08:00

css

Move v1 documentation under docs/v1, with docs/index.html symlinking to docs/v1/index.html (with .nojekyll file to hopefully make the symlink work)

2016-11-15 20:54:30 -08:00

extras

Merge branch 'master' into 2

2016-11-17 22:00:36 -08:00

images

Move v1 documentation under docs/v1, with docs/index.html symlinking to docs/v1/index.html (with .nojekyll file to hopefully make the symlink work)

2016-11-15 20:54:30 -08:00

index.html

Revert to http://coffeescript.org until GitHub pages supports HTTPS for custom domains (#4363)

2016-11-17 09:57:03 -08:00