Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

c605da97

Commit c605da97 authored 5 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite-gsvk-again

parents a82c96b8 fe79b5e5

No related branches found

No related tags found

Loading

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

changelog.d/5293.bugfix 1 addition, 0 deletions

changelog.d/5293.bugfix
changelog.d/5294.bugfix 1 addition, 0 deletions

changelog.d/5294.bugfix
changelog.d/5296.misc 1 addition, 0 deletions

changelog.d/5296.misc
changelog.d/5300.bugfix 1 addition, 0 deletions

changelog.d/5300.bugfix
changelog.d/5303.misc 1 addition, 0 deletions

changelog.d/5303.misc
docs/admin_api/user_admin_api.rst 1 addition, 1 deletion

docs/admin_api/user_admin_api.rst
synapse/crypto/keyring.py 28 additions, 41 deletions

synapse/crypto/keyring.py
synapse/rest/client/v1/room.py 2 additions, 0 deletions

synapse/rest/client/v1/room.py
synapse/storage/events_worker.py 6 additions, 1 deletion

synapse/storage/events_worker.py
synapse/storage/roommember.py 11 additions, 22 deletions

synapse/storage/roommember.py
synapse/storage/schema/delta/54/stats2.sql 28 additions, 0 deletions

synapse/storage/schema/delta/54/stats2.sql
synapse/storage/stats.py 66 additions, 64 deletions

synapse/storage/stats.py

with 147 additions and 129 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