Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-06-09 14:24:32 +02:00
commit e6cca58881

2
.gitmodules vendored
View File

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