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

Merge commit '4ff4434a220813e446efde4a38e48a0416476dba'

Browse Source 
# Conflicts:
#	resources/vanilla
#	src/pocketmine/item/Banner.php
#	src/pocketmine/item/Item.php
This commit is contained in:
Dylan K. Taylor
2020-01-31 20:11:29 +00:00
parent ee4757303b 4ff4434a22
commit 96ac95798b
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/server-phar.php
View File

@ -41,7 +41,7 @@ function preg_quote_array(array $strings, string $delim = null) : array{
* @param string $pharPath
* @param string $basePath
* @param string[] $includedPaths
* @param array $metadata
* @param mixed[] $metadata
* @param string $stub
* @param int $signatureAlgo
* @param int|null $compression