Merge branch 'develop' into jest

Browse Source

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

...

This commit is contained in:

Karsten Hassel

2021-06-14 22:55:37 +02:00

parent 189c01fc74 a1c4be83d6

commit 1d8af5835d

5 changed files with 495 additions and 827 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

1303

package-lock.json generated

File diff suppressed because it is too large Load Diff