Geoffrey Booth 9b77371ea8 Merge commit '72cf485dceb6a88abb3b83493032734409c3591a' into 2 ...

# Conflicts:
#	Cakefile
#	docs/v1/index.html
#	documentation/sections/changelog.md
#	documentation/sections/installation.md
#	documentation/sections/introduction.md
#	lib/coffee-script/nodes.js
#	lib/coffee-script/rewriter.js
#	lib/coffee-script/sourcemap.js
#	lib/coffeescript/browser.js
#	lib/coffeescript/cake.js
#	lib/coffeescript/coffeescript.js
#	lib/coffeescript/command.js
#	lib/coffeescript/grammar.js
#	lib/coffeescript/helpers.js
#	lib/coffeescript/index.js
#	lib/coffeescript/lexer.js
#	lib/coffeescript/optparse.js
#	lib/coffeescript/register.js
#	lib/coffeescript/repl.js
#	lib/coffeescript/scope.js
#	package.json

2017-04-12 20:27:57 -07:00

..

examples

[CS2] 2.0.0-beta1 docs (#4494)

2017-04-09 23:07:58 -07:00

images

Apply SVG fill color through CSS

2017-01-12 22:24:06 -08:00

sections

Merge commit '72cf485dceb6a88abb3b83493032734409c3591a' into 2

2017-04-12 20:27:57 -07:00

v1

Merge commit '72cf485dceb6a88abb3b83493032734409c3591a' into 2

2017-04-12 20:27:57 -07:00

v2

[CS2] 2.0.0-beta1 docs (#4494)

2017-04-09 23:07:58 -07:00

index.html

Docs improvements: content in Markdown, organization into subtemplates, fixed tests (#4401)

2016-12-15 21:05:44 -08:00

test.html

Fix browser test.html to work with async tests

2017-02-20 15:59:58 -08:00