Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-02 16:46:02 +01:00
commit 50546a3563

1
.gitmodules vendored
View File

@ -31,7 +31,6 @@
[submodule "chesttools"] [submodule "chesttools"]
path = chesttools path = chesttools
url = https://sys4.fr/gitea/nalc/chesttools.git url = https://sys4.fr/gitea/nalc/chesttools.git
branch = nalc
[submodule "christmas_craft"] [submodule "christmas_craft"]
path = christmas_craft path = christmas_craft
url = https://sys4.fr/gitea/nalc/christmas_craft.git url = https://sys4.fr/gitea/nalc/christmas_craft.git