mrFq1 a35a3205ad Merge remote-tracking branch 'origin/master' into meta-dev ... # Conflicts: # ClashX.xcodeproj/project.pbxproj # ClashX/AppDelegate.swift # ClashX/Base.lproj/Main.storyboard # ClashX/General/Managers/Settings.swift # ClashX/Support Files/en.lproj/Localizable.strings # ClashX/Support Files/zh-Hans.lproj/Localizable.strings # ClashX/ViewControllers/Settings/GeneralSettingViewController.swift # ClashX/goClash/go.mod # ClashX/goClash/go.sum # ClashX/zh-Hans.lproj/Main.strings # Podfile.lock # README.md		2023-06-07 00:10:12 +08:00
..
Settings	Merge remote-tracking branch 'origin/master' into meta-dev	2023-06-07 00:10:12 +08:00
AboutViewController.swift	chore: about info	2023-01-02 20:56:58 +08:00
ClashWebViewContoller.swift	Merge remote-tracking branch 'origin/master' into meta-dev	2023-04-28 18:14:43 +08:00
DashboardManager.swift	Merge remote-tracking branch 'origin/master' into meta-dev	2023-06-07 00:10:12 +08:00
DashboardManagerSwiftUI.swift	feat: clashx dashboard	2023-06-05 23:44:14 +08:00
ExternalControlViewController.swift	misc: swift lint	2022-06-20 21:03:12 +08:00
RemoteConfigViewController.swift	feature: auto detect config filename when add remote config	2020-04-08 00:34:33 +08:00