Merge branch 'stable-1.1'
This commit is contained in:
commit
ae717b63ca
10
.gitmodules
vendored
10
.gitmodules
vendored
@ -136,15 +136,15 @@
|
|||||||
[submodule "lantern"]
|
[submodule "lantern"]
|
||||||
path = lantern
|
path = lantern
|
||||||
url = https://sys4.fr/gitea/nalc/lantern.git
|
url = https://sys4.fr/gitea/nalc/lantern.git
|
||||||
branch = nalc
|
|
||||||
[submodule "lavatemple"]
|
[submodule "lavatemple"]
|
||||||
path = lavatemple
|
path = lavatemple
|
||||||
url = https://sys4.fr/gitea/nalc/lavatemple.git
|
url = https://sys4.fr/gitea/nalc/lavatemple.git
|
||||||
branch = nalc
|
|
||||||
[submodule "lightning"]
|
[submodule "lightning"]
|
||||||
path = lightning
|
path = lightning
|
||||||
url = https://sys4.fr/gitea/nalc/lightning.git
|
url = https://sys4.fr/gitea/nalc/lightning.git
|
||||||
branch = nalc
|
[submodule "locks"]
|
||||||
|
path = locks
|
||||||
|
url = https://sys4.fr/gitea/nalc/locks.git
|
||||||
[submodule "maidroid"]
|
[submodule "maidroid"]
|
||||||
path = maidroid
|
path = maidroid
|
||||||
url = https://sys4.fr/gitea/nalc/maidroid.git
|
url = https://sys4.fr/gitea/nalc/maidroid.git
|
||||||
@ -477,10 +477,6 @@
|
|||||||
path = nalc
|
path = nalc
|
||||||
url = https://sys4.fr/gitea/nalc/nalc.git
|
url = https://sys4.fr/gitea/nalc/nalc.git
|
||||||
branch = nalc-1.1
|
branch = nalc-1.1
|
||||||
[submodule "locks"]
|
|
||||||
path = locks
|
|
||||||
url = https://sys4.fr/gitea/nalc/locks.git
|
|
||||||
branch = nalc-1.1
|
|
||||||
[submodule "unified_inventory"]
|
[submodule "unified_inventory"]
|
||||||
path = unified_inventory
|
path = unified_inventory
|
||||||
url = https://sys4.fr/gitea/nalc/unified_inventory.git
|
url = https://sys4.fr/gitea/nalc/unified_inventory.git
|
||||||
|
Loading…
Reference in New Issue
Block a user