Merge remote-tracking branch 'origin/master'

# Conflicts: # mods/ctf/ctf_map/ctf_map_core/maps
Update maps submodule
2021-09-25 21:58:09 +02:00 · 2021-09-25 21:55:49 +02:00 · 2021-09-25 21:54:09 +02:00
--- a/.gitmodules
+++ b/.gitmodules
@ -3,7 +3,7 @@
 	url = https://github.com/rubenwardy/crafting
 [submodule "mods/ctf/ctf_map/ctf_map_core/maps"]
 	path = mods/ctf/ctf_map/ctf_map_core/maps
-	url = https://github.com/MT-CTF/maps
+	url = https://git.sp-codes.de/philipmi/maps
 [submodule "mods/pvp/shooter"]
 	path = mods/pvp/shooter
 	url = https://git.sp-codes.de/philipmi/shooter
--- a/mods/ctf/ctf_map/ctf_map_core/maps
+++ b/mods/ctf/ctf_map/ctf_map_core/maps
@ -1 +1 @@
-Subproject commit 6afcf12e1ca22873fc4066b242f57b8398131745
+Subproject commit 10970201c9961fc34158b68dd14ff1e073e1124e
작성자	SHA1	메시지	날짜
philipmi	fce3b46407	Merge remote-tracking branch 'origin/master' # Conflicts: # mods/ctf/ctf_map/ctf_map_core/maps	2021-09-25 21:58:09 +02:00
philipmi	afd7d36a4e	Update maps submodule	2021-09-25 21:55:49 +02:00
philipmi	088f829c68	Update maps submodule	2021-09-25 21:54:09 +02:00