Merge branch 'stable'

This commit is contained in:
Dylan K. Taylor 2019-06-11 19:19:32 +01:00
commit 9765d78a5d
2 changed files with 1 additions and 1 deletions

2
.gitmodules vendored
View File

@ -2,7 +2,7 @@
path = resources/locale
url = https://github.com/pmmp/PocketMine-Language.git
[submodule "tests/preprocessor"]
path = tests/preprocessor
path = build/preprocessor
url = https://github.com/pmmp/preprocessor.git
[submodule "tests/plugins/PocketMine-DevTools"]
path = tests/plugins/PocketMine-DevTools