yicheng 2421285162 Merge branch 'master' into feature/yaml ... # Conflicts: # .gitignore # ClashX.xcodeproj/project.pbxproj # ClashX/AppDelegate.swift # ClashX/Support Files/initConfig.ini # ClashX/Support Files/sampleConfig.ini		2018-10-14 22:51:08 +08:00
..
xcshareddata/xcschemes	Remove ini codes	2018-10-14 22:48:51 +08:00
project.pbxproj	Merge branch 'master' into feature/yaml	2018-10-14 22:51:08 +08:00