Merge branch 'stable-1.0' into stable-1.1
This commit is contained in:
commit
e740f02aa5
12
.gitmodules
vendored
12
.gitmodules
vendored
@ -76,23 +76,21 @@
|
||||
[submodule "fail"]
|
||||
path = fail
|
||||
url = https://sys4.fr/gitea/nalc/fail.git
|
||||
branch = nalc
|
||||
[submodule "farming"]
|
||||
path = farming
|
||||
url = https://sys4.fr/gitea/nalc/farming.git
|
||||
branch = nalc
|
||||
[submodule "fishing"]
|
||||
path = fishing
|
||||
url = https://sys4.fr/gitea/mff/fishing.git
|
||||
branch = master
|
||||
[submodule "food"]
|
||||
path = food
|
||||
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"]
|
||||
path = framedglass
|
||||
url = https://sys4.fr/gitea/nalc/framedglass.git
|
||||
branch = nalc
|
||||
[submodule "glow"]
|
||||
path = glow
|
||||
url = https://sys4.fr/gitea/nalc/glow.git
|
||||
@ -473,10 +471,6 @@
|
||||
path = name_restrictions
|
||||
url = https://sys4.fr/gitea/nalc/name_restrictions.git
|
||||
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"]
|
||||
path = moretrees
|
||||
url = https://sys4.fr/gitea/nalc/moretrees.git
|
||||
|
Loading…
Reference in New Issue
Block a user