Merge remote-tracking branch 'origin/main'

Browse Source

# Conflicts:
#	gradle.properties

...

This commit is contained in:

FlorianMichael 2023-11-27 14:12:00 +01:00

parent 77c3f1a5a2 0220b7dc48

commit 96e480d539

No known key found for this signature in database

GPG Key ID: C2FB87E71C425126

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