Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-09-29 10:37:36 +02:00
commit a5a0da2e92

4
.gitmodules vendored
View File

@ -376,8 +376,8 @@
branch = nalc branch = nalc
[submodule "unifieddyes"] [submodule "unifieddyes"]
path = unifieddyes path = unifieddyes
url = https://sys4.fr/gitea/nalc/unifieddyes.git url = https://sys4.fr/gitea/mtcontrib/unifieddyes.git
branch = nalc branch = da24c09f62bd06e0b9a9309b5a1a3fdce4d02eed
[submodule "unifiedwool"] [submodule "unifiedwool"]
path = unifiedwool path = unifiedwool
url = https://sys4.fr/gitea/nalc/unifiedwool.git url = https://sys4.fr/gitea/nalc/unifiedwool.git