Merge branch 'develop' into release/1.4.0
This commit is contained in:
@ -31,7 +31,7 @@ Then I will rewrite the GUI code in Swift.
|
||||
|
||||
From [here](https://github.com/shadowsocks/ShadowsocksX-NG/releases/)
|
||||
|
||||
## Fetures
|
||||
## Features
|
||||
|
||||
- Use ss-local from shadowsocks-libev 2.5.6
|
||||
- Could Update PAC by download GFW List from GitHub.
|
||||
@ -64,6 +64,8 @@ Added global Keyboard shortcut <kbd>⌃</kbd> + <kbd>⌘</kbd> + <kbd>P</kbd> to
|
||||
|
||||
## Contributing
|
||||
|
||||
[](https://gitter.im/ShadowsocksX-NG/Lobby)
|
||||
|
||||
Contributions must be available on a separately named branch based on the latest version of the main branch develop.
|
||||
|
||||
ref: [GitFlow](http://nvie.com/posts/a-successful-git-branching-model/)
|
||||
|
Reference in New Issue
Block a user