summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-10-31 16:08:34 +0100
committerGitHub <noreply@github.com>2019-10-31 16:08:34 +0100
commit69489f8eb13f33ce79b2615deb3ac218a717792e (patch)
treec3f43273678f88b110ccdd906d7cf46a8ed26170 /synapse/crypto/keyring.py
parentMerge remote-tracking branch 'origin/master' into develop (diff)
parentNewsfile (diff)
downloadsynapse-69489f8eb13f33ce79b2615deb3ac218a717792e.tar.xz
Merge pull request #6307 from matrix-org/erikj/fix_purge_room
Fix /purge_room admin API
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions