Merge branch 'master' into dev

# Conflicts: # bin/version
2024-02-26 10:39:22 +08:00
parent c895532c5e f2daabbc5a
commit c742a58677
10 changed files with 56 additions and 46 deletions
--- a/bin/ShellCrash.tar.gz
+++ b/bin/ShellCrash.tar.gz
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/public.tar.gz
+++ b/bin/public.tar.gz
--- a/bin/version
+++ b/bin/version
@@ -4,5 +4,4 @@ clash_v=v1.7.1
 meta_v=v1.18.0
 singboxp_v=1.8.5-73d97226
 singbox_v=1.8.5
-versionsh=1.9.0pre11
-GeoIP_v=20240224
+versionsh=1.9.0pre12