diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:54:43 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-04-27 12:54:43 +0100 |
| commit | 3d1ae6139918ecb013c576a5eb0ed8e06103ebf6 (patch) | |
| tree | 5056d9455cb6a0d72da1dc2b5dcf1a98c6282c6e /synapse/crypto/keyring.py | |
| parent | Backport deferred.addTimeout (diff) | |
| parent | Merge pull request #3134 from matrix-org/erikj/fix_admin_media_api (diff) | |
| download | synapse-3d1ae6139918ecb013c576a5eb0ed8e06103ebf6.tar.xz | |
Merge branch 'develop' into rav/deferred_timeout
Diffstat (limited to 'synapse/crypto/keyring.py')
0 files changed, 0 insertions, 0 deletions