Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-25 01:07:39 +01:00
commit c38dfda23e
1 changed files with 3 additions and 4 deletions

7
.gitmodules vendored
View File

@ -217,6 +217,9 @@
[submodule "multitest"] [submodule "multitest"]
path = multitest path = multitest
url = https://sys4.fr/gitea/nalc/multitest.git url = https://sys4.fr/gitea/nalc/multitest.git
[submodule "name_restrictions"]
path = name_restrictions
url = https://sys4.fr/gitea/nalc/name_restrictions.git
[submodule "names_per_ip"] [submodule "names_per_ip"]
path = names_per_ip path = names_per_ip
url = https://sys4.fr/gitea/nalc/names_per_ip.git url = https://sys4.fr/gitea/nalc/names_per_ip.git
@ -445,10 +448,6 @@
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 branch = nalc
[submodule "name_restrictions"]
path = name_restrictions
url = https://sys4.fr/gitea/nalc/name_restrictions.git
branch = nalc-1.1
[submodule "plantlife_modpack"] [submodule "plantlife_modpack"]
path = plantlife_modpack path = plantlife_modpack
url = https://sys4.fr/gitea/nalc/plantlife_modpack.git url = https://sys4.fr/gitea/nalc/plantlife_modpack.git