summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-09-09 18:51:22 +0100
committerMark Haines <mark.haines@matrix.org>2016-09-09 18:51:22 +0100
commit3ddec016ffe5a624673b5c5d9573fb11851963b9 (patch)
tree798cf69b1aeeffb673a0aaad2a2a869f1224ebd6 /synapse/api
parentAllow clients to supply access_tokens as headers (diff)
parentMerge pull request #1096 from matrix-org/markjh/get_access_token (diff)
downloadsynapse-3ddec016ffe5a624673b5c5d9573fb11851963b9.tar.xz
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'synapse/api')
0 files changed, 0 insertions, 0 deletions