Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-09-28 23:28:54 +02:00
commit 6599ffda6c

2
.gitmodules vendored
View File

@ -472,7 +472,7 @@
branch = nalc branch = nalc
[submodule "toolranks"] [submodule "toolranks"]
path = toolranks path = toolranks
url = https://sys4.fr/gitea/nalc/toolranks.git url = https://sys4.fr/gitea/nalc/minetest-toolranks.git
branch = nalc branch = nalc
[submodule "global_exchange"] [submodule "global_exchange"]
path = global_exchange path = global_exchange