Merge branch 'stable-1.0' into stable-1.1

This commit is contained in:
Sys Quatre 2019-12-01 16:15:19 +01:00
commit e2e8219f9b
2 changed files with 1 additions and 8 deletions

7
.gitmodules vendored
View File

@ -232,31 +232,24 @@
[submodule "paintings"]
path = paintings
url = https://sys4.fr/gitea/mff/paintings.git
branch = master
[submodule "pdisc"]
path = pdisc
url = https://sys4.fr/gitea/nalc/pdisc.git
branch = nalc
[submodule "playeranim"]
path = playeranim
url = https://sys4.fr/gitea/nalc/playeranim.git
branch = nalc
[submodule "playereffects"]
path = playereffects
url = https://sys4.fr/gitea/nalc/minetest_playereffects.git
branch = master
[submodule "player_inactive"]
path = player_inactive
url = https://sys4.fr/gitea/nalc/player_inactive.git
branch = nalc
[submodule "player_monoids"]
path = player_monoids
url = https://sys4.fr/gitea/nalc/player_monoids.git
branch = nalc
[submodule "pmobs"]
path = pmobs
url = https://sys4.fr/gitea/nalc/pmobs.git
branch = nalc
[submodule "random_messages"]
path = random_messages
url = https://sys4.fr/gitea/nalc/random_messages.git

@ -1 +1 @@
Subproject commit e1bc0e23c80ab5953fa6f0cb78989f45f7269af5
Subproject commit 0f92ce7b10bfba96b4a0721dfae65c7efbad10d8