diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-30 16:39:49 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-05-30 16:39:49 +0100 |
| commit | 99113e40ba4c5667a60ebcbf391ba9a840693576 (patch) | |
| tree | f8376b9e7c7ee6e15049b85c39ac9e28bb4bbd75 /synapse/crypto/keyring.py | |
| parent | Merge pull request #5291 from matrix-org/erikj/add_index (diff) | |
| parent | 0.99.5.2 (diff) | |
| download | synapse-99113e40ba4c5667a60ebcbf391ba9a840693576.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions