Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-12-07 13:18:05 +01:00
commit 8752e0db6e

5
.gitmodules vendored
View File

@ -373,23 +373,18 @@
[submodule "camera"] [submodule "camera"]
path = camera path = camera
url = https://sys4.fr/gitea/nalc/camera.git url = https://sys4.fr/gitea/nalc/camera.git
branch = nalc
[submodule "invtweak"] [submodule "invtweak"]
path = invtweak path = invtweak
url = https://sys4.fr/gitea/nalc/invtweak.git url = https://sys4.fr/gitea/nalc/invtweak.git
branch = nalc
[submodule "inventory_icon"] [submodule "inventory_icon"]
path = inventory_icon path = inventory_icon
url = https://sys4.fr/gitea/nalc/minetest_inventory_icon.git url = https://sys4.fr/gitea/nalc/minetest_inventory_icon.git
branch = nalc
[submodule "pipeworks"] [submodule "pipeworks"]
path = pipeworks path = pipeworks
url = https://sys4.fr/gitea/nalc/pipeworks.git url = https://sys4.fr/gitea/nalc/pipeworks.git
branch = nalc
[submodule "awards"] [submodule "awards"]
path = awards path = awards
url = https://sys4.fr/gitea/nalc/awards.git url = https://sys4.fr/gitea/nalc/awards.git
branch = nalc
[submodule "toolranks"] [submodule "toolranks"]
path = toolranks path = toolranks
url = https://sys4.fr/gitea/nalc/minetest-toolranks.git url = https://sys4.fr/gitea/nalc/minetest-toolranks.git