summary refs log tree commit diff
path: root/synapse/appservice
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-05-15 16:09:32 +0100
committerErik Johnston <erik@matrix.org>2017-05-15 16:09:32 +0100
commitf451b64c8f8db1eebdc7c8bc80352e011b8ae978 (patch)
tree0f2926b280ee625fd0777effd1b0f840ade7d438 /synapse/appservice
parentUpdate comment (diff)
parentMerge pull request #2221 from psaavedra/sync_timeline_limit_filter_by_name (diff)
downloadsynapse-f451b64c8f8db1eebdc7c8bc80352e011b8ae978.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/prefill_state
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions