Dylan K. Taylor d6ed542fcd Merge remote-tracking branch 'origin/stable' into master ...

# Conflicts:
#	composer.json
#	composer.lock
#	src/CrashDump.php
#	src/pocketmine/Server.php
#	src/pocketmine/level/format/io/region/McRegion.php
#	tests/phpstan/configs/check-explicit-mixed-baseline.neon
#	tests/phpstan/configs/l7-baseline.neon
#	tests/phpstan/configs/l8-baseline.neon
#	tests/travis/setup-php.yml

2020-10-26 16:18:53 +00:00

..

configs

Merge remote-tracking branch 'origin/stable' into master

2020-10-26 16:18:53 +00:00

rules

added some phpstan-specific generic type annotations

2020-01-13 15:05:02 +00:00

stubs

ChunkUtils: be more specific in extension stub too

2020-06-15 23:07:05 +01:00

bootstrap.php

Merge remote-tracking branch 'origin/stable' into master

2020-10-13 17:51:49 +01:00