Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5ef91b96

Commit 5ef91b96 authored 5 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into rav/federation_client_async

parents ea23210b c7d6d5c6

No related branches found

No related tags found

No related merge requests found

Changes 7

Expand all Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/6821.misc 1 addition, 0 deletions

changelog.d/6821.misc
changelog.d/6836.misc 1 addition, 0 deletions

changelog.d/6836.misc
synapse/events/__init__.py 11 additions, 7 deletions

synapse/events/__init__.py
synapse/handlers/sync.py 364 additions, 341 deletions

synapse/handlers/sync.py
synapse/util/async_helpers.py 4 additions, 0 deletions

synapse/util/async_helpers.py
tests/storage/test_redaction.py 4 additions, 1 deletion

tests/storage/test_redaction.py
tox.ini 1 addition, 0 deletions

tox.ini

with 386 additions and 349 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