From 235dc03f21a8aec9f3640ad235b35a94d9e4bb90 Mon Sep 17 00:00:00 2001
From: sys4 <admin@sys4.fr>
Date: Sat, 12 Oct 2019 18:00:03 +0200
Subject: [PATCH] =?UTF-8?q?[3d=5Farmor]=20Mise=20=C3=A0=20jour?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules | 1 -
 3d_armor    | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 850db3c..e6b0d37 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -381,7 +381,6 @@
 [submodule "3d_armor"]
 	path = 3d_armor
 	url = https://sys4.fr/gitea/nalc/minetest-3d_armor.git
-	branch = nalc-1.2
 [submodule "bitchange"]
 	path = bitchange
 	url = https://sys4.fr/gitea/nalc/bitchange.git
diff --git a/3d_armor b/3d_armor
index e75d82e..afee335 160000
--- a/3d_armor
+++ b/3d_armor
@@ -1 +1 @@
-Subproject commit e75d82e8cb97302c912ecbfc6793d8ac18240e47
+Subproject commit afee335dc274944cc75afb87450bcb7bb618f255