summary refs log tree commit diff
path: root/synapse/handlers/search.py
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2018-07-27 12:26:52 +0100
committerWill Hunt <will@half-shot.uk>2018-07-27 12:26:52 +0100
commit46afacc215db24b128e502c2c23cc3f3205d6f70 (patch)
treeeb8bd164bcc1b49b507e4d41c900325bcbfc5a5a /synapse/handlers/search.py
parentAuth media/r0/config (diff)
parentMerge pull request #3391 from t3chguy/t3chguy/default_inviter_display_name_3pid (diff)
downloadsynapse-46afacc215db24b128e502c2c23cc3f3205d6f70.tar.xz
Merge remote-tracking branch 'upstream/develop' into hs/upload-limits
Diffstat (limited to 'synapse/handlers/search.py')
0 files changed, 0 insertions, 0 deletions