Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

fa6c93bd

Commit fa6c93bd authored 10 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 47281f8f c2b1dbd8

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

synapse/federation/federation_server.py
synapse/federation/transaction_queue.py 1 addition, 1 deletion

synapse/federation/transaction_queue.py
synapse/handlers/presence.py 4 additions, 4 deletions

synapse/handlers/presence.py
synapse/handlers/typing.py 1 addition, 1 deletion

synapse/handlers/typing.py
synapse/notifier.py 4 additions, 2 deletions

synapse/notifier.py
synapse/storage/roommember.py 1 addition, 1 deletion

synapse/storage/roommember.py

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