mrFq1 710f0c5e6b Merge remote-tracking branch 'origin/master' into meta-dev ... # Conflicts: # ClashX.xcodeproj/project.pbxproj # ClashX/General/Utils/JSBridgeHandler.swift # ClashX/Models/ClashProxy.swift # ClashX/Support Files/en.lproj/Localizable.strings # ClashX/Support Files/zh-Hans.lproj/Localizable.strings # ClashX/ViewControllers/ClashWebViewContoller.swift # ClashX/ViewControllers/Connections/Views/Cell/ConnectionTextCellView.swift # ClashX/goClash/go.mod # ClashX/goClash/go.sum # Gemfile # Gemfile.lock # Podfile # Podfile.lock		2023-11-02 15:59:10 +08:00
..
en.lproj	Merge remote-tracking branch 'origin/master' into meta-dev	2023-11-02 15:59:10 +08:00
zh-Hans.lproj	Merge remote-tracking branch 'origin/master' into meta-dev	2023-11-02 15:59:10 +08:00
zh-Hant.lproj	fix: should request location permission on macOS14	2023-10-14 19:33:05 +08:00