Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-12 20:36:18 +02:00
commit dfacb17f66
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"] [submodule "action_timers"]
path = action_timers path = action_timers
url = https://sys4.fr/gitea/nalc/action_timers.git url = https://sys4.fr/gitea/nalc/action_timers.git
@ -562,3 +558,7 @@
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
[submodule "3d_armor_classes"]
path = 3d_armor_classes
url = https://sys4.fr/gitea/nalc/3d_armor_classes.git
branch = nalc

@ -1 +1 @@
Subproject commit 89cf7a85db798100b67209bc9d4d9fa2baede06e Subproject commit fd81f21c70c94211740c8d9d2fbd71f07f620a28