Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-09-09 15:18:26 +02:00
commit 3d1a0f9c8e

8
.gitmodules vendored
View File

@ -330,6 +330,10 @@
path = signs_lib path = signs_lib
url = https://sys4.fr/gitea/nalc/signs_lib.git url = https://sys4.fr/gitea/nalc/signs_lib.git
branch = nalc branch = nalc
[submodule "snow"]
path = snow
url = https://sys4.fr/gitea/nalc/minetest-mod-snow.git
branch = nalc-1.1
[submodule "spears"] [submodule "spears"]
path = spears path = spears
url = https://sys4.fr/gitea/nalc/spears.git url = https://sys4.fr/gitea/nalc/spears.git
@ -490,10 +494,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 "snow"]
path = snow
url = https://sys4.fr/gitea/nalc/snow.git
branch = nalc-1.1
[submodule "diet"] [submodule "diet"]
path = diet path = diet
url = https://sys4.fr/gitea/nalc/diet.git url = https://sys4.fr/gitea/nalc/diet.git