summary refs log tree commit diff
path: root/synapse/storage/search.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-08-30 12:01:24 +0100
committerRichard van der Hoff <richard@matrix.org>2019-08-30 12:01:24 +0100
commitb272e7345f1ea48eef35e0dd34db0b67a33ed96d (patch)
tree9a9302aed93748357618015ea5bed13eb9bf0d12 /synapse/storage/search.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentRevert "Use the v2 lookup API for 3PID invites (#5897)" (#5937) (diff)
downloadsynapse-b272e7345f1ea48eef35e0dd34db0b67a33ed96d.tar.xz
Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage/search.py')
0 files changed, 0 insertions, 0 deletions