Merge branch 'develop' into ma

# Conflicts: # public
2024-09-06 18:20:54 +08:00 · 2024-09-06 18:20:54 +08:00 · 8c8ee30ef8
parent 770b9b084a
commit 8c8ee30ef8
2 changed files with 0 additions and 4 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -1,3 +0,0 @@
-[submodule "public"]
-	path = public
-	url = git@git.pogorockgames.com:mango-games/server/public.git
--- a/1
+++ b/1
@ -1 +0,0 @@
-Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793
				`@ -1 +0,0 @@`
				`Subproject commit 00b9fce886af5b6a926aa804d3cad33be9ea0793`