Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

99fa03e8

Commit 99fa03e8 authored 8 years ago by Erik Johnston

Downloads
- Plain Diff

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

parents 6826593b a8331897

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/presence.py 15 additions, 29 deletions

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

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

synapse/notifier.py
synapse/replication/slave/storage/events.py 3 additions, 0 deletions

synapse/replication/slave/storage/events.py
synapse/storage/roommember.py 17 additions, 0 deletions

synapse/storage/roommember.py
synapse/util/caches/descriptors.py 5 additions, 0 deletions

synapse/util/caches/descriptors.py

with 42 additions and 29 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