mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-10-18 12:04:46 +00:00
Merge commit 'dfbd85777'
# Conflicts: # resources/vanilla # src/VersionInfo.php
This commit is contained in:
# Conflicts: # resources/vanilla # src/VersionInfo.php