Merge branch 'master' into 1.15

Browse Source

# Conflicts:
#	gradle.properties

...

This commit is contained in:

gnembon committed 2019-11-12 22:13:30 -04:00

2 parents 831fc06e0a fd5e53ec42

commit e89e140536

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