mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-21 08:17:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stable' of https://github.com/pmmp/pocketmine-mp into stable

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-02-06 08:38:12 +00:00
commit 7d5f2eac8d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -33,7 +33,7 @@
"pocketmine/classloader": "^0.1.0",
"pocketmine/log": "^0.1.0",
"daverandom/callback-validator": "dev-master",
"adhocore/json-comment": "^0.0.7"
"adhocore/json-comment": "^0.1.0"
},
"require-dev": {
"phpstan/phpstan": "^0.12.8",

14
composer.lock generated
View File

@ -4,27 +4,27 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "e75353b6127ffbd846cdbad57b83a65f",
"content-hash": "1294d03ca688653618a4f1d58f5e4ec3",
"packages": [
{
"name": "adhocore/json-comment",
"version": "v0.0.7",
"version": "0.1.0",
"source": {
"type": "git",
"url": "https://github.com/adhocore/php-json-comment.git",
"reference": "135356c7e7336ef59924f1d921c770045f937a76"
"reference": "8448076039389f558f39ad0553aab87db3f81614"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/135356c7e7336ef59924f1d921c770045f937a76",
"reference": "135356c7e7336ef59924f1d921c770045f937a76",
"url": "https://api.github.com/repos/adhocore/php-json-comment/zipball/8448076039389f558f39ad0553aab87db3f81614",
"reference": "8448076039389f558f39ad0553aab87db3f81614",
"shasum": ""
},
"require": {
"php": ">=5.4"
},
"require-dev": {
"phpunit/phpunit": "^4.8 || ^5.7 || ^6.5"
"phpunit/phpunit": "^6.5 || ^7.5"
},
"type": "library",
"autoload": {
@ -48,7 +48,7 @@
"json",
"strip-comment"
],
"time": "2018-08-01T12:27:26+00:00"
"time": "2020-01-03T13:51:23+00:00"
},
{
"name": "daverandom/callback-validator",