Merge remote-tracking branch 'pmmp/master' 3.7.1

# Conflicts: # composer.lock # src/pocketmine/plugin/PluginManager.php # src/pocketmine/updater/AutoUpdater.php # src/pocketmine/updater/UpdateCheckTask.php # src/pocketmine/utils/Internet.php
BulletProject · Apr 1, 2019 · f3ff60b · f3ff60b
1 parent 384bef5
commit f3ff60b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/pocketmine/PocketMine.php b/src/pocketmine/PocketMine.php
@@ -38,7 +38,7 @@
 
 	const NAME = "PocketMine-MP";
 	const BASE_VERSION = "3.7.1";
-	const IS_DEVELOPMENT_BUILD = true;
+	const IS_DEVELOPMENT_BUILD = false;
 	const BUILD_NUMBER = 0;
 
 	const MIN_PHP_VERSION = "7.2.0";