Merge remote-tracking branch 'origin/master-MC1.11' into master-MC1.12

Browse Source

# Conflicts:
#	build.properties

...

This commit is contained in:

Vexatos 2017-10-04 20:18:19 +02:00

parent a1ee9458ee 795762df85

commit 43b11c6b91

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available