Merge commit 'b08c38f8f9615e47ae3e5df8267b8986aadabead'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2019-12-25 13:52:50 +00:00
commit e845415b17

View File

@ -36,7 +36,6 @@ use function system;
use const pocketmine\BASE_VERSION;
use const STDIN;
require_once dirname(__DIR__) . '/src/pocketmine/VersionInfo.php';
require_once dirname(__DIR__) . '/vendor/autoload.php';
if(isset($argv[1])){