394673055d
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. |
||
---|---|---|
.. | ||
admin | ||
client | ||
consent | ||
key | ||
media | ||
synapse | ||
__init__.py | ||
health.py | ||
well_known.py |