forked from nalc/nalc-server-mods
Merge branch 'stable-1.0' into stable-1.1
This commit is contained in:
commit
e8a5e6b63e
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -1,7 +1,3 @@
|
|||||||
[submodule "areas"]
|
|
||||||
path = areas
|
|
||||||
url = https://sys4.fr/gitea/nalc/areas.git
|
|
||||||
branch = nalc
|
|
||||||
[submodule "armor_monoid"]
|
[submodule "armor_monoid"]
|
||||||
path = armor_monoid
|
path = armor_monoid
|
||||||
url = https://sys4.fr/gitea/nalc/armor_monoid.git
|
url = https://sys4.fr/gitea/nalc/armor_monoid.git
|
||||||
@ -562,3 +558,7 @@
|
|||||||
path = action_timers
|
path = action_timers
|
||||||
url = https://sys4.fr/gitea/mff/action_timers.git
|
url = https://sys4.fr/gitea/mff/action_timers.git
|
||||||
branch = master
|
branch = master
|
||||||
|
[submodule "areas"]
|
||||||
|
path = areas
|
||||||
|
url = https://sys4.fr/gitea/nalc/areas.git
|
||||||
|
branch = nalc
|
||||||
|
Loading…
Reference in New Issue
Block a user