diff options
author | Erik Johnston <erik@matrix.org> | 2019-01-29 22:58:38 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2019-01-29 22:58:38 +0000 |
commit | 67b82f133631879244773421988d52b1eb626d78 (patch) | |
tree | b62b1658804c8f76cde6f5a9d24e7aff3af56438 /synapse/handlers/directory.py | |
parent | Fixup comment (diff) | |
parent | Merge pull request #4514 from matrix-org/erikj/remove_event_id (diff) | |
download | synapse-67b82f133631879244773421988d52b1eb626d78.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/redactions_eiah
Diffstat (limited to 'synapse/handlers/directory.py')
0 files changed, 0 insertions, 0 deletions