Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Terraform modules
- Service Desk

Snippets Groups Projects

c17efdc0

Commit c17efdc0 authored 5 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' of github.com:matrix-org/synapse into erikj/refactor_stores

parents 23d62ede 27617316

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/5726.feature
changelog.d/6229.bugfix 1 addition, 0 deletions

changelog.d/6229.bugfix
demo/start.sh 1 addition, 2 deletions

demo/start.sh
docs/postgres.md 7 additions, 3 deletions

docs/postgres.md
synapse/handlers/e2e_keys.py 390 additions, 1 deletion

synapse/handlers/e2e_keys.py
synapse/rest/client/v2_alpha/keys.py 52 additions, 1 deletion

synapse/rest/client/v2_alpha/keys.py
synapse/storage/data_stores/main/end_to_end_keys.py 37 additions, 11 deletions

synapse/storage/data_stores/main/end_to_end_keys.py
tests/handlers/test_e2e_keys.py 294 additions, 1 deletion

tests/handlers/test_e2e_keys.py

with 783 additions and 19 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