Merge branch '4.x'

Browse Source

# Conflicts:
#	Gruntfile.js
#	package-lock.json
#	package.json

...

This commit is contained in:

Nils Knappmeier

2019-12-14 18:46:25 +01:00

parent 8a062f19d5 164b7ff0de

commit d23ccf636a

27 changed files with 1497 additions and 727 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

+918 -275

File diff suppressed because it is too large Load Diff