Skip to content

Conversation

@alexbpx
Copy link
Contributor

@alexbpx alexbpx commented Nov 29, 2018

No description provided.

…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
@yaronschwimmer yaronschwimmer merged commit 3ec6bbf into dev Nov 29, 2018
@alexbpx alexbpx deleted the dev-custom-params-enforcer-tel branch December 5, 2018 08:21
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.

3 participants