Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

7025781d

Commit 7025781d authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1

parents a7925259 142f1263

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/app/homeserver.py 65 additions, 1 deletion

synapse/app/homeserver.py
synapse/http/agent_name.py 0 additions, 18 deletions

synapse/http/agent_name.py
synapse/http/client.py 5 additions, 5 deletions

synapse/http/client.py
synapse/http/matrixfederationclient.py 2 additions, 2 deletions

synapse/http/matrixfederationclient.py
synapse/http/server.py 18 additions, 9 deletions

synapse/http/server.py
synapse/http/server_key_resource.py 5 additions, 1 deletion

synapse/http/server_key_resource.py
synapse/python_dependencies.py 3 additions, 3 deletions

synapse/python_dependencies.py
tests/utils.py 8 additions, 2 deletions

tests/utils.py

with 106 additions and 41 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