Merge branch 'master' into dev-2.0.0-rc-merge-main

FederatedAI · Dec 21, 2023 · 374b34a · 374b34a
2 parents 108093e + ea550db
commit 374b34a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,16 +1,16 @@
 [submodule "eggroll"]
 	path = eggroll
-	url = https://github.com/WeBankFinTech/eggroll
-	branch = v3.0.0-beta
+	url = https://github.com/FederatedAI/eggroll.git
+	branch = dev-3.0.0-rc
 [submodule "fate_client"]
 	path = fate_client
 	url = https://github.com/FederatedAI/FATE-Client
-	branch = v2.0.0-beta
+	branch = dev-2.0.0-rc
 [submodule "fate_flow"]
 	path = fate_flow
 	url = https://github.com/FederatedAI/FATE-Flow
-	branch = v2.0.0-beta
+	branch = dev-2.0.0-rc
 [submodule "fate_test"]
 	path = fate_test
 	url = https://github.com/FederatedAI/FATE-Test.git
-	branch = v2.0.0-beta
+	branch = dev-2.0.0-rc
diff --git a/eggroll b/eggroll
diff --git a/fate_flow b/fate_flow
diff --git a/fate_test b/fate_test