Merge commit 'ed0d1978a'

Browse Source

# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/WritableBook.php

...

This commit is contained in:

Dylan K. Taylor

2020-06-03 12:58:57 +01:00

parent 01cbd27485 ed0d1978aa

commit 892fa1598d

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