summary refs log tree commit diff
path: root/synapse/rest/admin/rooms.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2021-04-28 14:43:10 +0100
committerErik Johnston <erik@matrix.org>2021-04-28 14:43:10 +0100
commit802560211ae0472cb54e643089b039cc077d4ab0 (patch)
tree428dd0039a908eba510984a087d00a44475aed31 /synapse/rest/admin/rooms.py
parentUse the parent's logging context name for runWithConnection. (#9895) (diff)
parentFix tight loop handling presence replication. (#9900) (diff)
downloadsynapse-802560211ae0472cb54e643089b039cc077d4ab0.tar.xz
Merge remote-tracking branch 'origin/release-v1.33.0' into develop
Diffstat (limited to 'synapse/rest/admin/rooms.py')
0 files changed, 0 insertions, 0 deletions