Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

4f8baab0

Commit 4f8baab0 authored 6 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'master' into develop

parents dfba1d84 2fd17b5a

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.dockerignore 0 additions, 1 deletion

.dockerignore
CHANGES.md 14 additions, 0 deletions

CHANGES.md
synapse/__init__.py 1 addition, 1 deletion

synapse/__init__.py
synapse/federation/federation_base.py 110 additions, 16 deletions

synapse/federation/federation_base.py
synapse/federation/federation_server.py 10 additions, 10 deletions

synapse/federation/federation_server.py
synapse/federation/persistence.py 4 additions, 4 deletions

synapse/federation/persistence.py
synapse/federation/transport/server.py 1 addition, 1 deletion

synapse/federation/transport/server.py
tests/handlers/test_typing.py 8 additions, 11 deletions

tests/handlers/test_typing.py
tests/utils.py 9 additions, 3 deletions

tests/utils.py

with 157 additions and 47 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