diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 15:57:40 +0100 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-18 15:57:40 +0100 |
commit | 0a9d22808ceedaf9b96f417b777f7233a4dd8104 (patch) | |
tree | d33926271277fecbd788a58d55f3ffd57c199fee /tox.ini | |
parent | Merge pull request #6214 from matrix-org/rav/event_auth/1 (diff) | |
parent | Merge branch 'develop' into uhoreg/e2e_cross-signing_merged (diff) | |
download | synapse-0a9d22808ceedaf9b96f417b777f7233a4dd8104.tar.xz |
Merge branch 'uhoreg/e2e_cross-signing_merged' into develop
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions