Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

77b4711b

Commit 77b4711b authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'release-v1.20.0' into develop

parents 7513006b f25af1f9

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/8234.misc
changelog.d/8252.feature 1 addition, 0 deletions

changelog.d/8252.feature
changelog.d/8254.feature 1 addition, 0 deletions

changelog.d/8254.feature
synapse/config/saml2_config.py 1 addition, 1 deletion

synapse/config/saml2_config.py
synapse/push/push_tools.py 1 addition, 1 deletion

synapse/push/push_tools.py
synapse/storage/databases/main/devices.py 3 additions, 9 deletions

synapse/storage/databases/main/devices.py
synapse/storage/databases/main/end_to_end_keys.py 14 additions, 25 deletions

synapse/storage/databases/main/end_to_end_keys.py
synapse/storage/databases/main/schema/delta/58/15unread_count.sql 3 additions, 3 deletions

...storage/databases/main/schema/delta/58/15unread_count.sql

with 25 additions and 39 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