Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-11-03 13:13:55 +01:00
commit ae717b63ca

10
.gitmodules vendored
View File

@ -136,15 +136,15 @@
[submodule "lantern"]
path = lantern
url = https://sys4.fr/gitea/nalc/lantern.git
branch = nalc
[submodule "lavatemple"]
path = lavatemple
url = https://sys4.fr/gitea/nalc/lavatemple.git
branch = nalc
[submodule "lightning"]
path = lightning
url = https://sys4.fr/gitea/nalc/lightning.git
branch = nalc
[submodule "locks"]
path = locks
url = https://sys4.fr/gitea/nalc/locks.git
[submodule "maidroid"]
path = maidroid
url = https://sys4.fr/gitea/nalc/maidroid.git
@ -477,10 +477,6 @@
path = nalc
url = https://sys4.fr/gitea/nalc/nalc.git
branch = nalc-1.1
[submodule "locks"]
path = locks
url = https://sys4.fr/gitea/nalc/locks.git
branch = nalc-1.1
[submodule "unified_inventory"]
path = unified_inventory
url = https://sys4.fr/gitea/nalc/unified_inventory.git