Merge branch 'develop' into develop

This commit is contained in:
Qiu Yuzhou
2017-02-08 10:28:40 +08:00
committed by GitHub

View File

@ -31,7 +31,7 @@ Then I will rewrite the GUI code in Swift.
From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/) From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/)
## Fetures ## Features
- Use ss-local from shadowsocks-libev 2.5.6 - Use ss-local from shadowsocks-libev 2.5.6
- Could Update PAC by download GFW List from GitHub. - Could Update PAC by download GFW List from GitHub.