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 remote-tracking branch 'origin/stable'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
#	src/CrashDump.php
#	src/pocketmine/VersionInfo.php
#	src/pocketmine/network/mcpe/protocol/DataPacket.php
This commit is contained in:
Dylan K. Taylor
2020-12-23 22:34:25 +00:00
parent 8b5529fe17 873e8740e0
commit f215207a27
4 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "9ffd33446ed14804ca22c92c04a39796",
"content-hash": "ac798f92ac7eb3abe7fcead8074bac94",
"packages": [
{
"name": "adhocore/json-comment",
@ -1521,16 +1521,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.63",
"version": "0.12.64",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "c97ec4754bd53099a06c24847bd2870b99966b6a"
"reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/c97ec4754bd53099a06c24847bd2870b99966b6a",
"reference": "c97ec4754bd53099a06c24847bd2870b99966b6a",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
"reference": "23eb1cb7ae125f45f1d0e48051bcf67a9a9b08aa",
"shasum": ""
},
"require": {
@ -1561,7 +1561,7 @@
"description": "PHPStan - PHP Static Analysis Tool",
"support": {
"issues": "https://github.com/phpstan/phpstan/issues",
"source": "https://github.com/phpstan/phpstan/tree/0.12.63"
"source": "https://github.com/phpstan/phpstan/tree/0.12.64"
},
"funding": [
{
@ -1577,7 +1577,7 @@
"type": "tidelift"
}
],
"time": "2020-12-15T16:37:16+00:00"
"time": "2020-12-21T11:59:02+00:00"
},
{
"name": "phpstan/phpstan-phpunit",