Merge branch 'master' into future

Browse Source

# Conflicts:
#	gradle.properties

...

This commit is contained in:

gnembon committed 2021-08-25 16:55:32 -03:00

2 parents 2d96f968e5 9f30c47f19

commit f808848356

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