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

Merge branch 'stable' into next-minor

Browse Source
This commit is contained in:
Dylan K. Taylor
2020-05-06 20:25:11 +01:00
parent f87e96026c ef97c8f99e
commit 717b866605
7 changed files with 71 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
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": "d717744d5a481a98d003220e3e6d932b",
"content-hash": "d3e3f1bbaf2a7dd3b214287ba2acdff8",
"packages": [
{
"name": "adhocore/json-comment",
@ -529,16 +529,16 @@
},
{
"name": "phpstan/phpstan",
"version": "0.12.19",
"version": "0.12.23",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d"
"reference": "71e529efced79e055fa8318b692e7f7d03ea4e75"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"reference": "054f6d76b12ba9a6c13a5a8d5fcdf51219615f4d",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75",
"reference": "71e529efced79e055fa8318b692e7f7d03ea4e75",
"shasum": ""
},
"require": {
@ -581,7 +581,7 @@
"type": "tidelift"
}
],
"time": "2020-04-19T20:35:10+00:00"
"time": "2020-05-05T12:55:44+00:00"
},
{
"name": "phpstan/phpstan-phpunit",