summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-09-12 11:14:56 +0100
committerMark Haines <mark.haines@matrix.org>2016-09-12 11:14:56 +0100
commit4a32d25d4c97b10f74e636d46b312ba6b660987b (patch)
tree53c35423e6469adc87cc5b213d5b960fd143277c /synapse/api
parentFix unit tests (diff)
parentMerge pull request #1102 from matrix-org/revert-1099-dbkr/make_notif_highligh... (diff)
downloadsynapse-4a32d25d4c97b10f74e636d46b312ba6b660987b.tar.xz
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions