Merge branch 'master' into 1.17

Browse Source

# Conflicts:
#	gradle.properties

...

This commit is contained in:

gnembon committed 2020-11-14 19:31:14 -04:00

2 parents c8b5dbb26d f787910c70

commit a0ca0ef1d8

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