diff options
author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:20:34 -0400 |
---|---|---|
committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-07 13:20:34 -0400 |
commit | 8e86f5b65c2c2ef4606e415d710f1d847a462a6d (patch) | |
tree | 2f97e3d7416fe9fbabe2432055ffd625ccb6da82 /synapse/rest/consent | |
parent | Merge pull request #5769 from matrix-org/uhoreg/e2e_cross-signing2-part1 (diff) | |
parent | Servers-known-about statistic (#5981) (diff) | |
download | synapse-8e86f5b65c2c2ef4606e415d710f1d847a462a6d.tar.xz |
Merge branch 'develop' into uhoreg/e2e_cross-signing_merged
Diffstat (limited to 'synapse/rest/consent')
0 files changed, 0 insertions, 0 deletions