Merge branch 'stable-1.0' into stable-1.1

2019-07-22 20:26:03 +02:00 · 2019-07-22 20:26:03 +02:00 · ec0d68aede
commit ec0d68aede
parent e6cca58881 fb1945635b
2 changed files with 2 additions and 2 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -289,7 +289,7 @@
 [submodule "playereffects"]
 	path = playereffects
 	url = https://sys4.fr/gitea/nalc/minetest_playereffects.git
-	branch = nalc
+	branch = master
 [submodule "player_inactive"]
 	path = player_inactive
 	url = https://sys4.fr/gitea/nalc/player_inactive.git
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 0f92ce7b10bfba96b4a0721dfae65c7efbad10d8
+Subproject commit e1bc0e23c80ab5953fa6f0cb78989f45f7269af5