Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Matrix
- Activity
- Members
- Labels
- Container Registry
- Model registry
- Environments

Snippets Groups Projects

f23af347

Commit f23af347 authored 9 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 3a02a13e 6be1b4b1

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

MANIFEST.in 4 additions, 3 deletions

MANIFEST.in
synapse/api/auth.py 38 additions, 35 deletions

synapse/api/auth.py
synapse/federation/federation_client.py 25 additions, 8 deletions

synapse/federation/federation_client.py
synapse/federation/federation_server.py 15 additions, 16 deletions

synapse/federation/federation_server.py
synapse/federation/transport/client.py 14 additions, 2 deletions

synapse/federation/transport/client.py
synapse/federation/transport/server.py 38 additions, 1 deletion

synapse/federation/transport/server.py
synapse/handlers/_base.py 0 additions, 11 deletions

synapse/handlers/_base.py
synapse/handlers/federation.py 81 additions, 18 deletions

synapse/handlers/federation.py
synapse/handlers/room.py 11 additions, 8 deletions

synapse/handlers/room.py
synapse/handlers/search.py 2 additions, 3 deletions

synapse/handlers/search.py
synapse/http/matrixfederationclient.py 8 additions, 2 deletions

synapse/http/matrixfederationclient.py
synapse/rest/client/v1/room.py 8 additions, 12 deletions

synapse/rest/client/v1/room.py
synapse/util/retryutils.py 5 additions, 2 deletions

synapse/util/retryutils.py
synapse/util/third_party_invites.py 0 additions, 69 deletions

synapse/util/third_party_invites.py

with 249 additions and 190 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