diff options
| author | Erik Johnston <erik@matrix.org> | 2015-08-20 16:09:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-08-20 16:09:27 +0100 |
| commit | 3befc9ccc3b7d19fc7c19af3ee9572d89e0fe127 (patch) | |
| tree | 1949a627914b7f22f4450fc76d133db49e278b3b /synapse/crypto/keyring.py | |
| parent | Merge pull request #235 from matrix-org/erikj/room_avatars (diff) | |
| parent | Merge pull request #237 from matrix-org/markjh/readme-rst-formatting (diff) | |
| download | synapse-3befc9ccc3b7d19fc7c19af3ee9572d89e0fe127.tar.xz | |
Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions