Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-10-11 20:22:00 +02:00
commit f47c65c28d

2
.gitmodules vendored
View File

@ -393,7 +393,7 @@
[submodule "warps"] [submodule "warps"]
path = warps path = warps
url = https://sys4.fr/gitea/nalc/warps.git url = https://sys4.fr/gitea/nalc/warps.git
branch = nalc branch = 5c24fff8b5a0c126ba66773563fef05ee1330f8f
[submodule "weather_pack"] [submodule "weather_pack"]
path = weather_pack path = weather_pack
url = https://sys4.fr/gitea/nalc/weather_pack.git url = https://sys4.fr/gitea/nalc/weather_pack.git