Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep user bypass setting when use global proxy mode #2049

Merged
merged 1 commit into from Nov 11, 2018
Merged

Keep user bypass setting when use global proxy mode #2049

merged 1 commit into from Nov 11, 2018

Conversation

ghost
Copy link

@ghost ghost commented Oct 20, 2018

Please follow the guide below

  • You will be asked some questions, please read them carefully and answer honestly

  • Put an x into all the boxes [ ] relevant to your pull request (like that [x])

  • Use Preview tab to see how your pull request will actually look like

  • Searched for similar pull requests

  • Compiled the code with Visual Studio

What is the purpose of your pull request?

  • Bug fix
  • Improvement
  • New feature

Description of your pull request and other information

Explanation of your pull request in arbitrary form goes here. Please make sure the description explains the purpose and effect of your pull request and is worded well enough to be understood. Provide as much context and examples as possible.

PR for #2022 #2003 , merge user bypass list with LAN IP bypass list. So we can keep user bypass setting without change in GUI or configuration file.

@celeron533 celeron533 merged commit 0bd1389 into shadowsocks:master Nov 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant