Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-08-13 20:41:38 +02:00
commit 27bb8c3759

2
.gitmodules vendored
View File

@ -312,7 +312,7 @@
branch = nalc branch = nalc
[submodule "returnmirror"] [submodule "returnmirror"]
path = returnmirror path = returnmirror
url = https://sys4.fr/gitea/nalc/returnmirror.git url = https://sys4.fr/gitea/nalc/minetest_returnmirror.git
branch = nalc branch = nalc
[submodule "riesenpilz"] [submodule "riesenpilz"]
path = riesenpilz path = riesenpilz