Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

4e62ffdb

Commit 4e62ffdb authored 9 years ago by Daniel Wagner-Hall

Downloads
- Plain Diff

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

parents f522f50a 17581877

Branches

Tags

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

synapse/handlers/events.py 1 addition, 12 deletions

synapse/handlers/events.py
synapse/handlers/federation.py 0 additions, 2 deletions

synapse/handlers/federation.py
synapse/handlers/room.py 0 additions, 1 deletion

synapse/handlers/room.py
synapse/handlers/sync.py 1 addition, 15 deletions

synapse/handlers/sync.py
synapse/notifier.py 3 additions, 3 deletions

synapse/notifier.py
synapse/server.py 0 additions, 5 deletions

synapse/server.py
synapse/storage/stream.py 1 addition, 2 deletions

synapse/storage/stream.py
synapse/util/lockutils.py 0 additions, 74 deletions

synapse/util/lockutils.py
tests/storage/test_redaction.py 0 additions, 4 deletions

tests/storage/test_redaction.py
tests/storage/test_stream.py 0 additions, 4 deletions

tests/storage/test_stream.py
tests/util/test_lock.py 0 additions, 108 deletions

tests/util/test_lock.py
tests/utils.py 1 addition, 1 deletion

tests/utils.py

with 7 additions and 231 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