diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:21:25 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:21:25 -0400 |
commit | b6e3decd2b0c3608035f37bc6f9dcda9dd974322 (patch) | |
tree | 9dccb1711608f8c0b3a6dcd22eaa6f100c7a4e17 /synapse/handlers/e2e_keys.py | |
parent | Merge branch 'develop' into cross-signing_sig_upload (diff) | |
parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
download | synapse-b6e3decd2b0c3608035f37bc6f9dcda9dd974322.tar.xz |
Merge branch 'uhoreg/e2e_cross-signing_merged' into cross-signing_sig_upload
Diffstat (limited to 'synapse/handlers/e2e_keys.py')
0 files changed, 0 insertions, 0 deletions