Merge branch 'stable-1.0' into stable-1.1

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

2
.gitmodules vendored
View File

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

@ -1 +1 @@
Subproject commit 0f92ce7b10bfba96b4a0721dfae65c7efbad10d8 Subproject commit e1bc0e23c80ab5953fa6f0cb78989f45f7269af5