Merge branch 'stable' of https://github.com/pmmp/pocketmine-mp into stable

This commit is contained in:
Dylan K. Taylor 2020-04-25 11:59:35 +01:00
commit 32262d9bb5

6
composer.lock generated
View File

@ -424,11 +424,11 @@
"packages-dev": [
{
"name": "irstea/phpunit-shim",
"version": "8.5.3",
"version": "8.5.4",
"source": {
"type": "git",
"url": "https://gitlab.irstea.fr/pole-is/tools/phpunit-shim.git",
"reference": "b55d058d7ad3cf516068f22138a5b8fb724605db"
"reference": "25b3ffe1502bfd35d5cd23dc37f2f2e70cdf0b54"
},
"require": {
"ext-dom": "*",
@ -474,7 +474,7 @@
"testing",
"xunit"
],
"time": "2020-04-01T02:21:12+00:00"
"time": "2020-04-24T02:20:21+00:00"
},
{
"name": "phpstan/phpstan",