mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-06-07 12:18:46 +00:00
Merge branch 'next-minor'
# Conflicts: # resources/vanilla
This commit is contained in:
commit
b8e57282e3
6
.gitignore
vendored
6
.gitignore
vendored
@ -43,3 +43,9 @@ test_data/*
|
||||
|
||||
# Doxygen
|
||||
Documentation/*
|
||||
|
||||
# PHPUnit
|
||||
/.phpunit.result.cache
|
||||
|
||||
# php-cs-fixer
|
||||
/.php_cs.cache
|
||||
|
Loading…
x
Reference in New Issue
Block a user