diff options
author | Mark Haines <mark.haines@matrix.org> | 2014-11-20 11:02:30 +0000 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2014-11-20 11:02:30 +0000 |
commit | 217950b9adb39920c66f97bd6e41e9b28d4e7b2f (patch) | |
tree | 07dcd7a895451bf4d534bf21e1b542e990ff20ba /synapse/crypto/keyring.py | |
parent | Merge branch 'master' into develop (diff) | |
parent | Use tagged version of matrix-angular-sdk (diff) | |
download | synapse-217950b9adb39920c66f97bd6e41e9b28d4e7b2f.tar.xz |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions