diff options
author | Erik Johnston <erik@matrix.org> | 2021-04-28 14:43:10 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2021-04-28 14:43:10 +0100 |
commit | 802560211ae0472cb54e643089b039cc077d4ab0 (patch) | |
tree | 428dd0039a908eba510984a087d00a44475aed31 /synapse/rest/admin/rooms.py | |
parent | Use the parent's logging context name for runWithConnection. (#9895) (diff) | |
parent | Fix tight loop handling presence replication. (#9900) (diff) | |
download | synapse-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