mirror of
https://github.com/matrix-org/synapse.git
synced 2025-09-29 17:41:12 +02:00
Required some fixes due to merge conflicts with #6739, but nothing too hairy. The first commit is the same as the original (after merge conflict resolution) then two more for compatibility with the latest sync code.