mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-02-21 03:29:49 -05: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.