Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

27d0c1ec

Commit 27d0c1ec authored 10 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'develop' into event_signing

parents 3dac27a8 9aed791f

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

synapse/federation/replication.py 1 addition, 1 deletion

synapse/federation/replication.py
synapse/federation/units.py 6 additions, 2 deletions

synapse/federation/units.py
tests/federation/test_federation.py 1 addition, 0 deletions

tests/federation/test_federation.py
tests/handlers/test_presence.py 1 addition, 0 deletions

tests/handlers/test_presence.py
tests/handlers/test_typing.py 1 addition, 0 deletions

tests/handlers/test_typing.py

with 10 additions and 3 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