Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

aa4d8c1f

Commit aa4d8c1f authored 4 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'master' into develop

parents bc4bf7b3 ebd534b5

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 37 additions, 3 deletions

CHANGES.md
UPGRADE.rst 22 additions, 0 deletions

UPGRADE.rst
debian/changelog 11 additions, 0 deletions

debian/changelog
debian/control 4 additions, 2 deletions

debian/control
docker/Dockerfile-dhvirtualenv 10 additions, 2 deletions

docker/Dockerfile-dhvirtualenv
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/http/client.py 1 addition, 0 deletions

synapse/http/client.py
synapse/http/proxyagent.py 13 additions, 3 deletions

synapse/http/proxyagent.py
tests/http/test_proxyagent.py 130 additions, 0 deletions

tests/http/test_proxyagent.py

with 229 additions and 11 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment