mirror of
https://github.com/element-hq/synapse.git
synced 2026-04-04 12:05:43 +00: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.