summary refs log tree commit diff
path: root/synapse/handlers/directory.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-01-29 22:58:38 +0000
committerErik Johnston <erik@matrix.org>2019-01-29 22:58:38 +0000
commit67b82f133631879244773421988d52b1eb626d78 (patch)
treeb62b1658804c8f76cde6f5a9d24e7aff3af56438 /synapse/handlers/directory.py
parentFixup comment (diff)
parentMerge pull request #4514 from matrix-org/erikj/remove_event_id (diff)
downloadsynapse-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