mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-05 11:27:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit '1bbeb6245'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-06-13 11:44:44 +01:00
commit f3271a0d19
2 changed files with 440 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -53,7 +53,7 @@
"phpstan/phpstan": "^0.12.25",
"phpstan/phpstan-phpunit": "^0.12.6",
"phpstan/phpstan-strict-rules": "^0.12.2",
"phpunit/phpunit": "^8.5"
"phpunit/phpunit": "^9.2"
},
"autoload": {
"psr-4": {

706
composer.lock generated
View File

File diff suppressed because it is too large Load Diff