Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-06 19:35:36 +01:00
commit 289a91dacf

2
.gitmodules vendored
View File

@ -340,11 +340,9 @@
[submodule "xban2"] [submodule "xban2"]
path = xban2 path = xban2
url = https://sys4.fr/gitea/nalc/xban2.git url = https://sys4.fr/gitea/nalc/xban2.git
branch = nalc
[submodule "zombie"] [submodule "zombie"]
path = zombie path = zombie
url = https://sys4.fr/gitea/nalc/zombie.git url = https://sys4.fr/gitea/nalc/zombie.git
branch = nalc
[submodule "connected_chests"] [submodule "connected_chests"]
path = connected_chests path = connected_chests
url = https://sys4.fr/gitea/nalc/connected_chests.git url = https://sys4.fr/gitea/nalc/connected_chests.git