Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

synapse
- Activity
- Members
- Labels
- Service Desk

Snippets Groups Projects

484867d3

Commit 484867d3 authored 6 years ago by Erik Johnston

Downloads
- Plain Diff

Merge branch 'develop' into release-v0.34.1

parents 32172f22 d1d81d06

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/4361.misc 1 addition, 0 deletions

changelog.d/4361.misc
changelog.d/4362.misc 1 addition, 0 deletions

changelog.d/4362.misc
synapse/federation/transaction_queue.py 6 additions, 1 deletion

synapse/federation/transaction_queue.py
synapse/http/matrixfederationclient.py 5 additions, 5 deletions

synapse/http/matrixfederationclient.py

with 13 additions and 6 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