Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

25d2b5d5

Commit 25d2b5d5 authored 6 years ago by Neil Johnson

Downloads
- Plain Diff

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

parents df1e4f25 3f543dc0

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

CONTRIBUTING.rst 10 additions, 10 deletions

CONTRIBUTING.rst
changelog.d/3574.feature 1 addition, 0 deletions

changelog.d/3574.feature
synapse/handlers/sync.py 149 additions, 10 deletions

synapse/handlers/sync.py
synapse/rest/client/v2_alpha/sync.py 1 addition, 0 deletions

synapse/rest/client/v2_alpha/sync.py
synapse/storage/_base.py 3 additions, 4 deletions

synapse/storage/_base.py
synapse/storage/state.py 3 additions, 2 deletions

synapse/storage/state.py
synapse/storage/stream.py 2 additions, 2 deletions

synapse/storage/stream.py

with 169 additions and 28 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