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

Merge commit 'c4150d45207a8681ea1f181c7ee4ca75109a21de'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-05-13 13:30:31 +01:00
commit c69411c984
1 changed files with 6 additions and 6 deletions
Show Stats 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", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "a852a026a0a9f5ca2dbea5c06aab4856", "content-hash": "ddcd2b92755f3ad3f9a8a75d2c794194",
"packages": [ "packages": [
{ {
"name": "adhocore/json-comment", "name": "adhocore/json-comment",
@ -845,16 +845,16 @@
}, },
{ {
"name": "phpstan/phpstan", "name": "phpstan/phpstan",
"version": "0.12.23", "version": "0.12.25",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpstan/phpstan.git", "url": "https://github.com/phpstan/phpstan.git",
"reference": "71e529efced79e055fa8318b692e7f7d03ea4e75" "reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/71e529efced79e055fa8318b692e7f7d03ea4e75", "url": "https://api.github.com/repos/phpstan/phpstan/zipball/9619551d68b2d4c0d681a8df73f3c847c798ee64",
"reference": "71e529efced79e055fa8318b692e7f7d03ea4e75", "reference": "9619551d68b2d4c0d681a8df73f3c847c798ee64",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -897,7 +897,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-05-05T12:55:44+00:00" "time": "2020-05-10T20:36:16+00:00"
}, },
{ {
"name": "phpstan/phpstan-phpunit", "name": "phpstan/phpstan-phpunit",