summary refs log tree commit diff
path: root/synapse/handlers/search.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-10-12 15:06:18 +0100
committerErik Johnston <erik@matrix.org>2015-10-12 15:06:18 +0100
commitf6fde343a10890e2e8a509e82babb34dd0fbaf06 (patch)
treeeab85df2d409119042a731667bd1cec1bc70028f /synapse/handlers/search.py
parentRemove unused room_id parameter (diff)
parentMerge pull request #296 from matrix-org/markjh/eventstream_presence (diff)
downloadsynapse-f6fde343a10890e2e8a509e82babb34dd0fbaf06.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/search
Diffstat (limited to 'synapse/handlers/search.py')
0 files changed, 0 insertions, 0 deletions