Merge remote-tracking branch 'origin/develop' into develop

Browse Source

# Conflicts:
#	src/locales/it.json

...

This commit is contained in:

Stefan Dej

2021-08-24 20:45:45 +02:00

parent 3cf493db73 a13f9d9a92

commit aed9caef6b

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