Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-03 11:46:50 +01:00
commit 2c8b6bc0d8

8
.gitmodules vendored
View File

@ -91,10 +91,12 @@
[submodule "framedglass"]
path = framedglass
url = https://sys4.fr/gitea/nalc/framedglass.git
[submodule "gauges"]
path = gauges
url = https://sys4.fr/gitea/nalc/gauges.git
[submodule "glow"]
path = glow
url = https://sys4.fr/gitea/nalc/glow.git
branch = nalc
[submodule "h2omes"]
path = h2omes
url = https://sys4.fr/gitea/mff/h2omes.git
@ -491,10 +493,6 @@
path = unified_inventory
url = https://sys4.fr/gitea/nalc/unified_inventory.git
branch = nalc-1.1
[submodule "gauges"]
path = gauges
url = https://sys4.fr/gitea/nalc/gauges.git
branch = nalc-1.1
[submodule "interact"]
path = interact
url = https://sys4.fr/gitea/nalc/interact.git