Merge branch 'stable-1.1'

This commit is contained in:
Sys Quatre 2019-10-12 15:22:42 +02:00
commit c527f08530

2
.gitmodules vendored
View File

@ -545,7 +545,7 @@
[submodule "3d_armor"] [submodule "3d_armor"]
path = 3d_armor path = 3d_armor
url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git
branch = nalc branch = nalc-1.0
[submodule "3d_armor_classes"] [submodule "3d_armor_classes"]
path = 3d_armor_classes path = 3d_armor_classes
url = https://sys4.fr/gitea/nalc/3d_armor_classes.git url = https://sys4.fr/gitea/nalc/3d_armor_classes.git