Merge branch '4.x'

Browse Source

# Conflicts:
#	Gruntfile.js
#	lib/handlebars/compiler/compiler.js
#	lib/handlebars/compiler/javascript-compiler.js
#	lib/handlebars/helpers/block-helper-missing.js
#	lib/handlebars/helpers/each.js
#	lib/handlebars/helpers/with.js
#	lib/handlebars/runtime.js
#	spec/compiler.js
#	spec/regressions.js
#	spec/runtime.js
#	spec/string-params.js
#	spec/subexpressions.js
#	spec/track-ids.js

...

This commit is contained in:

Nils Knappmeier

2019-12-03 22:48:35 +01:00

parent 3fb331ef40 e97685e989

commit dfe0fcb130

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

Diff Content Not Available