Merge branch '4.x'

Browse Source

# Conflicts:
#	components/bower.json
#	components/handlebars.js.nuspec
#	components/package.json
#	package-lock.json
#	package.json

...

This commit is contained in:

Nils Knappmeier

2019-09-03 22:24:48 +02:00

parent dce44541db 164c7ceea4

commit 35d3fdb1dd

33 changed files with 552 additions and 391 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

package-lock.json

Generated

+266 -237

File diff suppressed because it is too large Load Diff