nalc
/
nalc-server-mods
4
0
Fork 1
Code Issues 35 Pull Requests Releases Wiki Activity

Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-11-03 11:25:27 +01:00
parent 02ef7582c8 956bc170f3
commit e740f02aa5
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitmodules vendored
View File

@ -76,23 +76,21 @@
[submodule "fail"] [submodule "fail"]
path = fail path = fail
url = https://sys4.fr/gitea/nalc/fail.git url = https://sys4.fr/gitea/nalc/fail.git
branch = nalc
[submodule "farming"] [submodule "farming"]
path = farming path = farming
url = https://sys4.fr/gitea/nalc/farming.git url = https://sys4.fr/gitea/nalc/farming.git
branch = nalc
[submodule "fishing"] [submodule "fishing"]
path = fishing path = fishing
url = https://sys4.fr/gitea/mff/fishing.git url = https://sys4.fr/gitea/mff/fishing.git
branch = master
[submodule "food"] [submodule "food"]
path = food path = food
url = https://sys4.fr/gitea/nalc/food.git url = https://sys4.fr/gitea/nalc/food.git
branch = nalc [submodule "food_sweet"]
path = food_sweet
url = https://sys4.fr/gitea/nalc/food_sweet.git
[submodule "framedglass"] [submodule "framedglass"]
path = framedglass path = framedglass
url = https://sys4.fr/gitea/nalc/framedglass.git url = https://sys4.fr/gitea/nalc/framedglass.git
branch = nalc
[submodule "glow"] [submodule "glow"]
path = glow path = glow
url = https://sys4.fr/gitea/nalc/glow.git url = https://sys4.fr/gitea/nalc/glow.git
@ -473,10 +471,6 @@
path = name_restrictions path = name_restrictions
url = https://sys4.fr/gitea/nalc/name_restrictions.git url = https://sys4.fr/gitea/nalc/name_restrictions.git
branch = nalc-1.1 branch = nalc-1.1
[submodule "food_sweet"]
path = food_sweet
url = https://sys4.fr/gitea/nalc/food_sweet.git
branch = nalc-1.1
[submodule "moretrees"] [submodule "moretrees"]
path = moretrees path = moretrees
url = https://sys4.fr/gitea/nalc/moretrees.git url = https://sys4.fr/gitea/nalc/moretrees.git