Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-11-25 01:02:35 +01:00
commit 350f06dec7

7
.gitmodules vendored
View File

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