Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

2aa5bf13

Commit 2aa5bf13 authored 4 years ago by Richard van der Hoff

Downloads
- Plain Diff

Merge branch 'release-v1.12.4' into develop

parents 51f7eaf9 51f358e2

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/7289.bugfix
changelog.d/7311.feature 1 addition, 0 deletions

changelog.d/7311.feature
docs/workers.md 2 additions, 0 deletions

docs/workers.md
synapse/app/generic_worker.py 6 additions, 0 deletions

synapse/app/generic_worker.py
synapse/federation/transport/client.py 40 additions, 9 deletions

synapse/federation/transport/client.py
synapse/handlers/e2e_keys.py 139 additions, 9 deletions

synapse/handlers/e2e_keys.py
synapse/rest/client/v2_alpha/account_data.py 8 additions, 0 deletions

synapse/rest/client/v2_alpha/account_data.py

with 197 additions and 18 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