diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-08 17:05:01 +0100 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-10-08 17:05:01 +0100 |
commit | 23b50d6fb881db23324cac9f64cba33a1d3747b3 (patch) | |
tree | 160ac2f45363782b0bbc77dc845f410b18585199 /tests/handlers/test_e2e_room_keys.py | |
parent | Add `xyz.amorgan.knock` /versions string (diff) | |
parent | Merge tag 'v1.21.0rc3' into develop (diff) | |
download | synapse-23b50d6fb881db23324cac9f64cba33a1d3747b3.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into soru/knock
Diffstat (limited to 'tests/handlers/test_e2e_room_keys.py')
-rw-r--r-- | tests/handlers/test_e2e_room_keys.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/handlers/test_e2e_room_keys.py b/tests/handlers/test_e2e_room_keys.py |