diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-08-10 14:57:27 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-08-10 14:57:27 +0100 |
| commit | c31793a784059d3c90c1a81396fa832fa9efebac (patch) | |
| tree | 63654adb84ea710c6de7d94216a137a536ec44c3 /tests/crypto/test_keyring.py | |
| parent | log *after* reloading log config (diff) | |
| parent | changelog (diff) | |
| download | synapse-c31793a784059d3c90c1a81396fa832fa9efebac.tar.xz | |
Merge branch 'rav/fix_linearizer_cancellation' into develop
Diffstat (limited to 'tests/crypto/test_keyring.py')
0 files changed, 0 insertions, 0 deletions