Merge commit '22b52f03d12fb82b4c8cd16ef6b0d2c8cb44f9f5'

Browse Source

# Conflicts:
#	resources/vanilla
#	src/pocketmine/Player.php

...

This commit is contained in:

Dylan K. Taylor 2020-06-26 19:15:18 +01:00

parent a8180cdf0b 22b52f03d1

commit 94ad0cd3f3

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