Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-13 19:27:57 +02:00
commit 3e9024355c

8
.gitmodules vendored
View File

@ -1,7 +1,3 @@
[submodule "action_timers"]
path = action_timers
url = https://sys4.fr/gitea/nalc/action_timers.git
branch = nalc
[submodule "areas"] [submodule "areas"]
path = areas path = areas
url = https://sys4.fr/gitea/nalc/areas.git url = https://sys4.fr/gitea/nalc/areas.git
@ -562,3 +558,7 @@
path = WorldEdit path = WorldEdit
url = https://sys4.fr/gitea/nalc/Minetest-WorldEdit.git url = https://sys4.fr/gitea/nalc/Minetest-WorldEdit.git
branch = nalc branch = nalc
[submodule "action_timers"]
path = action_timers
url = https://sys4.fr/gitea/mff/action_timers.git
branch = master