summary refs log tree commit diff
path: root/synapse/handlers/search.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-11-03 17:31:17 +0000
committerMark Haines <mark.haines@matrix.org>2015-11-03 17:31:17 +0000
commita3bfef35fd5fc26723d377839e1200f2de733723 (patch)
tree6315a13c38c7d55defff5b8674645d57b6ca47e3 /synapse/handlers/search.py
parentInclude read receipts in v2 sync (diff)
parentMerge pull request #335 from matrix-org/markjh/room_tags (diff)
downloadsynapse-a3bfef35fd5fc26723d377839e1200f2de733723.tar.xz
Merge branch 'develop' into markjh/v2_sync_receipts
Conflicts:
	synapse/handlers/sync.py
Diffstat (limited to 'synapse/handlers/search.py')
0 files changed, 0 insertions, 0 deletions