Merge branch 'master' into update-electron

Browse Source

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

...

This commit is contained in:

Borewit

2019-07-21 10:42:32 +02:00

parent b216929dc4 c96f212726

commit 188f1cac8f

15 changed files with 408 additions and 499 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

687

package-lock.json generated

File diff suppressed because it is too large Load Diff