summary refs log tree commit diff
path: root/synapse/crypto/keyring.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-10-24 09:21:47 +0100
committerGitHub <noreply@github.com>2017-10-24 09:21:47 +0100
commit9e2c22c97f018007da95bf22f48173ea3b9fd1ed (patch)
tree8dccdc67ee0e19ff8e21e3230c9c0b0ccd4a9855 /synapse/crypto/keyring.py
parentMerge pull request #2568 from matrix-org/rav/pep8 (diff)
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/group_fed_... (diff)
downloadsynapse-9e2c22c97f018007da95bf22f48173ea3b9fd1ed.tar.xz
Merge pull request #2567 from matrix-org/erikj/group_fed_update_profile
Correctly wire in update group profile over federation
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions