Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

ff7f0e8a

Commit ff7f0e8a authored 4 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'release-v1.22.0' into develop

parents e8dbbcb6 9e0f5a0a

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

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

changelog.d/8654.bugfix
changelog.d/8656.bugfix 1 addition, 0 deletions

changelog.d/8656.bugfix
synapse/handlers/appservice.py 4 additions, 3 deletions

synapse/handlers/appservice.py
synapse/storage/databases/main/metrics.py 5 additions, 4 deletions

synapse/storage/databases/main/metrics.py

with 11 additions and 7 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