Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

3e6a19cf

Commit 3e6a19cf authored 10 years ago by David Baker

Downloads
- Plain Diff

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

parents 5308e302 eab463fd

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

docs/specification.rst 68 additions, 33 deletions

docs/specification.rst
synapse/federation/replication.py 2 additions, 0 deletions

synapse/federation/replication.py
synapse/handlers/events.py 5 additions, 1 deletion

synapse/handlers/events.py
synapse/handlers/presence.py 127 additions, 89 deletions

synapse/handlers/presence.py
synapse/notifier.py 1 addition, 0 deletions

synapse/notifier.py
synapse/streams/config.py 1 addition, 1 deletion

synapse/streams/config.py
synapse/util/logutils.py 53 additions, 0 deletions

synapse/util/logutils.py
tests/handlers/test_presence.py 87 additions, 51 deletions

tests/handlers/test_presence.py
tests/handlers/test_presencelike.py 39 additions, 15 deletions

tests/handlers/test_presencelike.py
tests/utils.py 31 additions, 6 deletions

tests/utils.py
webclient/room/room-controller.js 9 additions, 10 deletions

webclient/room/room-controller.js

with 423 additions and 206 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