Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-07 14:17:02 +01:00
commit e624ebc7b5

7
.gitmodules vendored
View File

@ -406,23 +406,18 @@
[submodule "irc"] [submodule "irc"]
path = irc path = irc
url = https://sys4.fr/gitea/nalc/irc.git url = https://sys4.fr/gitea/nalc/irc.git
branch = nalc
[submodule "3d_armor"] [submodule "3d_armor"]
path = 3d_armor path = 3d_armor
url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git
branch = nalc-1.0
[submodule "3d_armor_classes"] [submodule "3d_armor_classes"]
path = 3d_armor_classes path = 3d_armor_classes
url = https://sys4.fr/gitea/nalc/3d_armor_classes.git url = https://sys4.fr/gitea/nalc/3d_armor_classes.git
[submodule "WorldEdit"] [submodule "WorldEdit"]
path = WorldEdit path = WorldEdit
url = https://sys4.fr/gitea/nalc/Minetest-WorldEdit.git url = https://sys4.fr/gitea/mtcontrib/Minetest-WorldEdit.git
branch = nalc
[submodule "action_timers"] [submodule "action_timers"]
path = action_timers path = action_timers
url = https://sys4.fr/gitea/mff/action_timers.git url = https://sys4.fr/gitea/mff/action_timers.git
branch = master
[submodule "areas"] [submodule "areas"]
path = areas path = areas
url = https://sys4.fr/gitea/nalc/areas.git url = https://sys4.fr/gitea/nalc/areas.git
branch = nalc