Charlie Qiu 91124b9e90 Merge branch 'pr/85' into develop ...

# Conflicts:
#	ShadowsocksX-NG/AppDelegate.swift

2016-10-14 23:39:11 +08:00

..

project.xcworkspace

Initial Commit

2016-06-05 21:29:13 +08:00

xcshareddata/xcschemes

解决 macOS 10.12 下 PAC 模式下Safari 或 Twitter 客户端 tweetbot客户端不能FQ的问题

2016-08-23 17:08:21 +08:00

project.pbxproj

Merge branch 'pr/85' into develop

2016-10-14 23:39:11 +08:00