Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

bc2bd92b

Commit bc2bd92b authored 2 years ago by Patrick Cloke

Downloads
- Plain Diff

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

parents d1bdeccb b43be004

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

.dockerignore 1 addition, 0 deletions

.dockerignore
.github/workflows/docker.yml 6 additions, 1 deletion

.github/workflows/docker.yml
CHANGES.md 33 additions, 1 deletion

CHANGES.md
debian/changelog 12 additions, 0 deletions

debian/changelog
docker/Dockerfile 7 additions, 1 deletion

docker/Dockerfile
pyproject.toml 9 additions, 4 deletions

pyproject.toml
synapse/config/repository.py 1 addition, 1 deletion

synapse/config/repository.py
synapse/replication/http/register.py 17 additions, 1 deletion

synapse/replication/http/register.py
synapse/storage/databases/main/event_push_actions.py 59 additions, 13 deletions

synapse/storage/databases/main/event_push_actions.py

with 145 additions and 22 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