diff options
author | Erik Johnston <erik@matrix.org> | 2015-04-17 16:08:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2015-04-17 16:08:28 +0100 |
commit | 4a5990ff8fba3c00851bb601a2482152fc4bb57f (patch) | |
tree | ca5b548faf1a3044c82f344d5601ea05fe718a07 /synapse/crypto/keyring.py | |
parent | Add kick users script (diff) | |
parent | Merge pull request #124 from matrix-org/hotfixes-v0.8.1-r4 (diff) | |
download | synapse-4a5990ff8fba3c00851bb601a2482152fc4bb57f.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions