Merge branch 'master' into 'develop'

Browse Source

# Conflicts:
#   gradle.properties

...

This commit is contained in:

Stefan Schüller 2021-10-05 07:18:26 +00:00

parent 3ee6071137 b2c934db21

commit b4881c2a2d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available