Merge branch 'master' into 2

Browse Source

# Conflicts:
#	lib/coffee-script/lexer.js
#	lib/coffee-script/parser.js

...

This commit is contained in:

Geoffrey Booth

2016-12-06 20:59:21 -08:00

parent fb3e1a8e65 88f2bf9fa5

commit 286eec74f9

9 changed files with 277 additions and 117 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

227

lib/coffee-script/parser.js

File diff suppressed because one or more lines are too long