Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

28ad246b

Commit 28ad246b authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

Merge pull request #584 from matrix-org/daniel/ephemeralthreepids

Allow third_party_signed to be specified on /join

parents a7b2ce32 577951b0

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/auth.py 36 additions, 21 deletions

synapse/api/auth.py
synapse/federation/federation_server.py 13 additions, 2 deletions

synapse/federation/federation_server.py
synapse/federation/transport/server.py 11 additions, 1 deletion

synapse/federation/transport/server.py
synapse/handlers/federation.py 72 additions, 21 deletions

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

synapse/handlers/room.py
synapse/python_dependencies.py 1 addition, 1 deletion

synapse/python_dependencies.py
synapse/rest/client/v1/room.py 4 additions, 0 deletions

synapse/rest/client/v1/room.py

with 196 additions and 54 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