Merge branch 'master' into 1.16

Browse Source

# Conflicts:
#	gradle.properties

...

This commit is contained in:

gnembon committed 2020-02-05 20:19:29 -04:00

2 parents 536b88e61f 5d8c34092a

commit ed4e35d017

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