Skip to content

Conversation

@alexbpx
Copy link
Contributor

@alexbpx alexbpx commented Dec 1, 2018

No description provided.

alexbpx and others added 30 commits November 24, 2018 13:54
…to dev-refactor-config

# Conflicts:
#	perimeterx/middleware.py
#	perimeterx/px_constants.py
#	perimeterx/px_context.py
#	perimeterx/px_httpc.py
…ams-enforcer-tel

# Conflicts:
#	perimeterx/middleware.py
#	perimeterx/px_activities_client.py
#	perimeterx/px_config.py
#	perimeterx/px_constants.py
#	perimeterx/px_context.py
#	perimeterx/px_cookie_v1.py
#	perimeterx/px_cookie_v3.py
#	perimeterx/px_httpc.py
#	perimeterx/px_proxy.py
…er-tel' into dev-mobile_sdk

# Conflicts:
#	perimeterx/middleware.py
#	perimeterx/px_context.py
#	perimeterx/px_cookie.py
#	perimeterx/px_cookie_validator.py
# Conflicts:
#	perimeterx/middleware.py
#	perimeterx/px_api.py
#	perimeterx/px_config.py
#	perimeterx/px_context.py
#	perimeterx/px_cookie_v1.py
#	perimeterx/px_cookie_v3.py
#	perimeterx/px_httpc.py
#	perimeterx/px_proxy_handler.py
#	tests/px_cookie_validator.py
#	tests/px_proxy_handler.py
# Conflicts:
#	perimeterx/middleware.py
#	perimeterx/px_api.py
#	perimeterx/px_config.py
#	perimeterx/px_context.py
#	perimeterx/px_cookie_v1.py
#	perimeterx/px_cookie_v3.py
#	perimeterx/px_httpc.py
#	perimeterx/px_proxy_handler.py
#	tests/px_cookie_validator.py
#	tests/px_proxy_handler.py
Copy link

@ilaif ilaif left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good job, I also added some branch-non-related comments that you can write down for a different PR, but should be addressed.

@yaronschwimmer yaronschwimmer merged commit 8a6b8ff into dev Dec 2, 2018
@yaronschwimmer yaronschwimmer deleted the dev-refactor-context branch December 2, 2018 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants