Merge branch 'stable-1.0' into stable-1.1

2019-07-22 20:26:03 +02:00
--- 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