Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

1f033ad5

Commit 1f033ad5 authored 1 year ago by Erik Johnston

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/develop' into release-v1.96

parents 60c5e8d7 0cc6509c

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

CHANGES.md 14 additions, 0 deletions

CHANGES.md
debian/changelog 6 additions, 0 deletions

debian/changelog
pyproject.toml 1 addition, 1 deletion

pyproject.toml
synapse/federation/federation_server.py 7 additions, 1 deletion

synapse/federation/federation_server.py
synapse/handlers/device.py 3 additions, 0 deletions

synapse/handlers/device.py
synapse/handlers/e2e_keys.py 6 additions, 0 deletions

synapse/handlers/e2e_keys.py

with 37 additions and 2 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