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

add default proxy detection for intranet/corporate firewalls #172

Merged
merged 3 commits into from Apr 12, 2017
Merged

add default proxy detection for intranet/corporate firewalls #172

merged 3 commits into from Apr 12, 2017

Conversation

Zoryn4163
Copy link
Contributor

No description provided.

@Wires77
Copy link
Contributor

Wires77 commented Apr 11, 2017

Did you mean to push this as a pull request? If so, I'm definitely going to have to reject the second commit based on changing the branding and needlessly changing code formatting.

This reverts commit abe5c47.
@Zoryn4163
Copy link
Contributor Author

My bad, I'm not the most experienced with git. Reverted the other commit that I did not mean to include.

@Wires77
Copy link
Contributor

Wires77 commented Apr 11, 2017

No problem. If you push code to the same branch you made a pull request on, GitHub will automatically add it to the pull request. Usually that means you want to make a separate branch for your pull request, and put any other code in your master branch.

@Zoryn4163
Copy link
Contributor Author

Yes that is what I just did with the other commit. I did verify that the manual proxy settings still function with the configuration update for automatic detection, so there should be no issue merging that commit.

@Wires77
Copy link
Contributor

Wires77 commented Apr 11, 2017

Excellent. I'll test it out tonight and merge it assuming it goes well.

@Wires77 Wires77 merged commit 5f40135 into adammhaile:master Apr 12, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants