Merge branch 'stable'

# Conflicts:
#	phpstan.neon.dist
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-14 20:03:02 +01:00
commit a39fbe600d

View File

@ -20,8 +20,9 @@ rules:
parameters:
level: 8
autoload_files:
bootstrapFiles:
- tests/phpstan/bootstrap.php
scanFiles:
- src/PocketMine.php
- build/make-release.php
- build/server-phar.php