Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
2019-05-12 20:36:18 +02:00
2 changed files with 5 additions and 5 deletions

8
.gitmodules vendored
View File

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