Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-06-09 13:10:51 +02:00
commit 2f4b562506

4
.gitmodules vendored
View File

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