Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
2019-07-22 20:26:03 +02:00
2 changed files with 2 additions and 2 deletions

2
.gitmodules vendored
View File

@ -289,7 +289,7 @@
[submodule "playereffects"]
path = playereffects
url = https://sys4.fr/gitea/nalc/minetest_playereffects.git
branch = nalc
branch = master
[submodule "player_inactive"]
path = player_inactive
url = https://sys4.fr/gitea/nalc/player_inactive.git