Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-12-06 18:55:13 +01:00
commit 73688eff84
1 changed files with 3 additions and 8 deletions

11
.gitmodules vendored
View File

@ -307,19 +307,18 @@
[submodule "unifiedbricks"]
path = unifiedbricks
url = https://sys4.fr/gitea/nalc/unifiedbricks.git
branch = nalc
[submodule "unifieddyes"]
path = unifieddyes
url = https://sys4.fr/gitea/mtcontrib/unifieddyes.git
branch = da24c09f62bd06e0b9a9309b5a1a3fdce4d02eed
[submodule "unified_inventory"]
path = unified_inventory
url = https://sys4.fr/gitea/nalc/unified_inventory.git
[submodule "unifiedwool"]
path = unifiedwool
url = https://sys4.fr/gitea/mtcontrib/unifiedwool.git
branch = master
[submodule "u_skins"]
path = u_skins
url = https://sys4.fr/gitea/nalc/minetest-u_skinsdb.git
branch = nalc
[submodule "vector_extras"]
path = vector_extras
url = https://sys4.fr/gitea/nalc/vector_extras.git
@ -432,10 +431,6 @@
path = nalc
url = https://sys4.fr/gitea/nalc/nalc.git
branch = nalc-1.1
[submodule "unified_inventory"]
path = unified_inventory
url = https://sys4.fr/gitea/nalc/unified_inventory.git
branch = nalc-1.1
[submodule "irc"]
path = irc
url = https://sys4.fr/gitea/nalc/irc.git