Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-06-02 17:18:44 +02:00
commit 5cce0b5e12

2
.gitmodules vendored
View File

@ -212,7 +212,7 @@
branch = nalc branch = nalc
[submodule "mobs"] [submodule "mobs"]
path = mobs path = mobs
url = https://sys4.fr/gitea/nalc/mobs.git url = https://sys4.fr/gitea/nalc/mobs_redo.git
branch = nalc branch = nalc
[submodule "mobs_animal"] [submodule "mobs_animal"]
path = mobs_animal path = mobs_animal