Merge branch 'dev' into master

# Conflicts: # bin/version # scripts/menu.sh
2024-01-16 18:36:30 +08:00
parent 7759b0ed9a 3ab931d946
commit 2090ead938
22 changed files with 395 additions and 246 deletions
--- a/bin/version
+++ b/bin/version
@@ -2,5 +2,7 @@ clashnet_v=v1.7.6
 clashpre_v=2022.11.25
 clash_v=v1.7.1
 meta_v=v1.18.0
+
 singbox_v=1.7.8
 versionsh=1.8.5d
+GeoIP_v=20240113