Merge branch 'master' into UpdateCommandFramework

2022-05-10 12:52:05 +02:00 · 2022-05-10 12:52:05 +02:00 · c7d8947671
Commit c7d8947671
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +1,4 @@
 [submodule "CommonCore"]
 	path = CommonCore
 	url = gitea@steamwar.de:SteamWar/CommonCore.git
+	branch = master
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 2d52bcbc60168e0e98219a32b4e7dfdc3d7ff485
+Subproject commit 0f03b57e437c1d843816b7202d95b79ff0a8d2df