diff options
| author | Neil Johnson <neil@matrix.org> | 2019-05-22 17:59:43 +0100 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-05-22 17:59:43 +0100 |
| commit | 73f1de31d107187949203ec8e3b3f248170b6316 (patch) | |
| tree | 4d776766aa7e8122610725a20c1844df2860fd55 /synapse/crypto/keyring.py | |
| parent | remove urllib3 pin (#5230) (diff) | |
| parent | 0.99.5.1 (diff) | |
| download | synapse-73f1de31d107187949203ec8e3b3f248170b6316.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions