diff options
author | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2015-02-11 16:43:26 +0000 |
commit | f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4 (patch) | |
tree | 96cfd120f7bdb70c1045a8080f4f97f3a30bd574 /synapse/crypto/keyring.py | |
parent | Minor tweaks based on PR feedback. (diff) | |
parent | Merge branch 'bugs/SYN-264' into develop (diff) | |
download | synapse-f2fdcb7c4bb09b447a31985d8b3f3989dac8c0a4.tar.xz |
Merge branch 'develop' into application-services
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions