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

Merge commit '0f6dc9082a781fcc6f70f3d3e05bd261c6f6c203'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-06-26 18:49:11 +01:00
parent 111f4b3778 0f6dc9082a
commit 9fd9428377
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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": "b8160d3c44bfbc1212084957a8ed3731",
"content-hash": "96c53cbd2154a5a665517d9b7d22af6b",
"packages": [
{
"name": "adhocore/json-comment",