diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-18 10:29:54 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-18 10:29:54 +0000 |
| commit | 2635d4e63459d77342d42ef4d2349524bf8fc982 (patch) | |
| tree | c686ff3d612fe3f94b4e7d0e95e9d54da920a190 /synapse/crypto/keyring.py | |
| parent | Merge branch 'hotfixes-v0.7.0g' of github.com:matrix-org/synapse into develop (diff) | |
| parent | Merge pull request #77 from matrix-org/failures (diff) | |
| download | synapse-2635d4e63459d77342d42ef4d2349524bf8fc982.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions