Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

53e171f3

Commit 53e171f3 authored 8 years ago by Mark Haines

Downloads
- Plain Diff

Merge branch 'markjh/liberate_presence_handler' into markjh/liberate_sync_handler

parents 80cb9bec e168abbc

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/__init__.py 0 additions, 2 deletions

synapse/handlers/__init__.py
synapse/handlers/events.py 1 addition, 1 deletion

synapse/handlers/events.py
synapse/handlers/message.py 2 additions, 2 deletions

synapse/handlers/message.py
synapse/handlers/presence.py 21 additions, 19 deletions

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

synapse/handlers/sync.py
synapse/replication/resource.py 1 addition, 1 deletion

synapse/replication/resource.py
synapse/rest/client/v1/presence.py 14 additions, 6 deletions

synapse/rest/client/v1/presence.py
synapse/rest/client/v1/room.py 1 addition, 1 deletion

synapse/rest/client/v1/room.py
synapse/rest/client/v2_alpha/receipts.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/receipts.py
synapse/rest/client/v2_alpha/sync.py 1 addition, 1 deletion

synapse/rest/client/v2_alpha/sync.py
synapse/server.py 5 additions, 0 deletions

synapse/server.py
tests/replication/test_resource.py 1 addition, 1 deletion

tests/replication/test_resource.py

with 49 additions and 36 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