Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-09-06 19:37:45 +02:00
commit affab9ec31

8
.gitmodules vendored
View File

@ -426,6 +426,10 @@
path = cherry_tree
url = https://sys4.fr/gitea/nalc/cherry_tree.git
branch = nalc
[submodule "sea"]
path = sea
url = https://sys4.fr/gitea/nalc/minetest-mod-sea.git
branch = nalc-1.1
[submodule "slimes"]
path = slimes
url = https://sys4.fr/gitea/nalc/slimes.git
@ -490,10 +494,6 @@
path = snow
url = https://sys4.fr/gitea/nalc/snow.git
branch = nalc-1.1
[submodule "sea"]
path = sea
url = https://sys4.fr/gitea/nalc/minetest-mod-sea.git
branch = nalc-1.1
[submodule "diet"]
path = diet
url = https://sys4.fr/gitea/nalc/diet.git