Merge branch 'master' into 1.16

Browse Source

# Conflicts:
#	gradle.properties

...

This commit is contained in:

gnembon committed 2020-05-14 12:45:59 -03:00

2 parents e8c73f4f5e 2265d87db2

commit e9c72ac4fe

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