Merge remote-tracking branch 'origin/master' into fabric/master

Browse Source

# Conflicts:
#	build.gradle

...

This commit is contained in:

Sebastian Hartte

2020-08-26 11:41:13 +02:00

parent d2b69671f5 a97b35f3d0

commit 1842febf86

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