mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-04 17:06:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '673e44445'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-05-31 15:03:48 +01:00
parent 7e86354519 673e444456
commit 8dc5b9e712
3 changed files with 1531 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
phpstan.neon.dist
View File

@ -25,7 +25,6 @@ parameters:
- src/PocketMine.php
- build/make-release.php
- build/server-phar.php
- vendor/irstea/phpunit-shim/phpunit
paths:
- src
- tests/phpstan/rules