mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'next-minor'

Browse Source 
# Conflicts:
#	composer.json
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-04-19 12:22:39 +01:00
parent 86f67445c6 804a062c3a
commit c097188a97
3 changed files with 76 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -43,7 +43,8 @@
"pocketmine/callback-validator": "^1.0.1",
"adhocore/json-comment": "^0.1.0",
"particle/validator": "^2.3",
"netresearch/jsonmapper": "^2.0"
"netresearch/jsonmapper": "^2.0",
"ocramius/package-versions": "^1.5"
},
"require-dev": {
"phpstan/phpstan": "^0.12.14",