Merge branch 'stable-1.0' into stable-1.1

2019-12-06 19:35:25 +01:00
Parent 640342035b 00fe631d1a
--- a/.gitmodules
+++ b/.gitmodules
@@ -340,11 +340,9 @@
 [submodule "xban2"]
 	path = xban2
 	url = https://sys4.fr/gitea/nalc/xban2.git
-	branch = nalc
 [submodule "zombie"]
 	path = zombie
 	url = https://sys4.fr/gitea/nalc/zombie.git
-	branch = nalc
 [submodule "connected_chests"]
 	path = connected_chests
 	url = https://sys4.fr/gitea/nalc/connected_chests.git