Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

30961182

Commit 30961182 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids

parents 778fa85f c1a133a6

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

synapse/api/constants.py 5 additions, 0 deletions

synapse/api/constants.py
synapse/api/urls.py 0 additions, 1 deletion

synapse/api/urls.py
synapse/appservice/__init__.py 2 additions, 0 deletions

synapse/appservice/__init__.py
synapse/appservice/api.py 36 additions, 3 deletions

synapse/appservice/api.py
synapse/handlers/appservice.py 10 additions, 0 deletions

synapse/handlers/appservice.py
synapse/handlers/federation.py 3 additions, 1 deletion

synapse/handlers/federation.py
synapse/rest/client/v2_alpha/thirdparty.py 21 additions, 3 deletions

synapse/rest/client/v2_alpha/thirdparty.py
synapse/types.py 0 additions, 7 deletions

synapse/types.py

with 77 additions and 15 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