merge from hotfix-macOS10.12

add local server to serve PAC file, this works on macOS 10.12 PAC mode
This commit is contained in:
qinyuhang
2016-08-23 20:37:35 +08:00
parent 1813d4a4da
commit bc7ca9eb0e
53 changed files with 13831 additions and 243 deletions
+2 -1
View File
@@ -7,7 +7,8 @@ target 'ShadowsocksX-NG' do
# Pods for ShadowsocksX-NG
pod 'Alamofire', '~> 3.4'
pod "GCDWebServer", "~> 3.0"
target 'ShadowsocksX-NGTests' do
inherit! :search_paths
# Pods for testing