Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-09-29 10:59:56 +02:00
commit d2a9d200eb

4
.gitmodules vendored
View File

@ -380,8 +380,8 @@
branch = da24c09f62bd06e0b9a9309b5a1a3fdce4d02eed branch = da24c09f62bd06e0b9a9309b5a1a3fdce4d02eed
[submodule "unifiedwool"] [submodule "unifiedwool"]
path = unifiedwool path = unifiedwool
url = https://sys4.fr/gitea/nalc/unifiedwool.git url = https://sys4.fr/gitea/mtcontrib/unifiedwool.git
branch = nalc branch = master
[submodule "u_skins"] [submodule "u_skins"]
path = u_skins path = u_skins
url = https://sys4.fr/gitea/nalc/minetest-u_skinsdb.git url = https://sys4.fr/gitea/nalc/minetest-u_skinsdb.git