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 'next-minor'

Browse Source 
# Conflicts:
#	composer.lock
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor
2020-04-19 12:56:44 +01:00
parent c6d6afe65e 70a4f73d73
commit 766a2178a0
5 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
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": "e13d435f1db3b942c95629a81677de51",
"content-hash": "6e9e4623c329b6647deb2cc0db21328b",
"packages": [
{
"name": "adhocore/json-comment",
@ -950,7 +950,7 @@
"prefer-stable": false,
"prefer-lowest": false,
"platform": {
"php": ">=7.2.0",
"php": ">=7.3.0",
"php-64bit": "*",
"ext-bcmath": "*",
"ext-chunkutils2": "^0.1.0",