Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-25 13:27:10 +02:00
commit c6427bb1af

4
.gitmodules vendored
View File

@ -104,8 +104,8 @@
branch = nalc branch = nalc
[submodule "fishing"] [submodule "fishing"]
path = fishing path = fishing
url = https://sys4.fr/gitea/nalc/fishing.git url = https://sys4.fr/gitea/mff/fishing.git
branch = nalc branch = master
[submodule "food"] [submodule "food"]
path = food path = food
url = https://sys4.fr/gitea/nalc/food.git url = https://sys4.fr/gitea/nalc/food.git