Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-07 13:53:18 +01:00
commit 406256ca85

6
.gitmodules vendored
View File

@ -388,27 +388,21 @@
[submodule "toolranks"] [submodule "toolranks"]
path = toolranks path = toolranks
url = https://sys4.fr/gitea/nalc/minetest-toolranks.git url = https://sys4.fr/gitea/nalc/minetest-toolranks.git
branch = nalc
[submodule "global_exchange"] [submodule "global_exchange"]
path = global_exchange path = global_exchange
url = https://sys4.fr/gitea/nalc/global_exchange.git url = https://sys4.fr/gitea/nalc/global_exchange.git
branch = nalc
[submodule "email"] [submodule "email"]
path = email path = email
url = https://sys4.fr/gitea/nalc/email.git url = https://sys4.fr/gitea/nalc/email.git
branch = nalc
[submodule "tsm_pyramids"] [submodule "tsm_pyramids"]
path = tsm_pyramids path = tsm_pyramids
url = https://sys4.fr/gitea/nalc/tsm_pyramids.git url = https://sys4.fr/gitea/nalc/tsm_pyramids.git
branch = nalc
[submodule "homedecor_modpack"] [submodule "homedecor_modpack"]
path = homedecor_modpack path = homedecor_modpack
url = https://sys4.fr/gitea/nalc/homedecor_modpack.git url = https://sys4.fr/gitea/nalc/homedecor_modpack.git
branch = nalc
[submodule "nalc"] [submodule "nalc"]
path = nalc path = nalc
url = https://sys4.fr/gitea/nalc/nalc.git url = https://sys4.fr/gitea/nalc/nalc.git
branch = nalc-1.1
[submodule "irc"] [submodule "irc"]
path = irc path = irc
url = https://sys4.fr/gitea/nalc/irc.git url = https://sys4.fr/gitea/nalc/irc.git