Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-12-01 15:32:37 +01:00
commit 68b9136232

3
.gitmodules vendored
View File

@ -223,15 +223,12 @@
[submodule "names_per_ip"] [submodule "names_per_ip"]
path = names_per_ip path = names_per_ip
url = https://sys4.fr/gitea/nalc/names_per_ip.git url = https://sys4.fr/gitea/nalc/names_per_ip.git
branch = nalc
[submodule "news"] [submodule "news"]
path = news path = news
url = https://sys4.fr/gitea/nalc/news.git url = https://sys4.fr/gitea/nalc/news.git
branch = nalc
[submodule "notice"] [submodule "notice"]
path = notice path = notice
url = https://sys4.fr/gitea/nalc/notice.git url = https://sys4.fr/gitea/nalc/notice.git
branch = nalc
[submodule "paintings"] [submodule "paintings"]
path = paintings path = paintings
url = https://sys4.fr/gitea/mff/paintings.git url = https://sys4.fr/gitea/mff/paintings.git