Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bfb6c586

Commit bfb6c586 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 a675f9c5 c151b32b

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/3184.feature 1 addition, 0 deletions

changelog.d/3184.feature
changelog.d/3589.feature 1 addition, 0 deletions

changelog.d/3589.feature
synapse/handlers/pagination.py 34 additions, 1 deletion

synapse/handlers/pagination.py
synapse/rest/client/versions.py 12 additions, 1 deletion

synapse/rest/client/versions.py
synapse/rest/media/v1/config_resource.py 48 additions, 0 deletions

synapse/rest/media/v1/config_resource.py
synapse/rest/media/v1/media_repository.py 2 additions, 1 deletion

synapse/rest/media/v1/media_repository.py

with 98 additions and 3 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