Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-03 08:58:31 +01:00
commit dd7428732e

10
.gitmodules vendored
View File

@ -58,15 +58,15 @@
[submodule "darkage"] [submodule "darkage"]
path = darkage path = darkage
url = https://sys4.fr/gitea/nalc/darkage.git url = https://sys4.fr/gitea/nalc/darkage.git
branch = nalc
[submodule "death_messages"] [submodule "death_messages"]
path = death_messages path = death_messages
url = https://sys4.fr/gitea/nalc/death_messages.git url = https://sys4.fr/gitea/nalc/death_messages.git
branch = nalc [submodule "diet"]
path = diet
url = https://sys4.fr/gitea/nalc/diet.git
[submodule "digilines"] [submodule "digilines"]
path = digilines path = digilines
url = https://sys4.fr/gitea/nalc/digilines.git url = https://sys4.fr/gitea/nalc/digilines.git
branch = nalc
[submodule "enchanting"] [submodule "enchanting"]
path = enchanting path = enchanting
url = https://sys4.fr/gitea/nalc/enchanting.git url = https://sys4.fr/gitea/nalc/enchanting.git
@ -475,10 +475,6 @@
path = name_restrictions path = name_restrictions
url = https://sys4.fr/gitea/nalc/name_restrictions.git url = https://sys4.fr/gitea/nalc/name_restrictions.git
branch = nalc-1.1 branch = nalc-1.1
[submodule "diet"]
path = diet
url = https://sys4.fr/gitea/nalc/diet.git
branch = nalc-1.1
[submodule "food_sweet"] [submodule "food_sweet"]
path = food_sweet path = food_sweet
url = https://sys4.fr/gitea/nalc/food_sweet.git url = https://sys4.fr/gitea/nalc/food_sweet.git