Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-05-12 19:57:33 +02:00
commit cc179d6432

8
.gitmodules vendored
View File

@ -458,10 +458,6 @@
path = factions
url = https://sys4.fr/gitea/nalc/factions.git
branch = nalc
[submodule "3d_armor"]
path = 3d_armor
url = https://sys4.fr/gitea/nalc/3d_armor.git
branch = nalc
[submodule "camera"]
path = camera
url = https://sys4.fr/gitea/nalc/camera.git
@ -562,3 +558,7 @@
path = irc
url = https://sys4.fr/gitea/nalc/irc.git
branch = nalc
[submodule "3d_armor"]
path = 3d_armor
url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git
branch = nalc