diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-09-09 18:51:22 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-09-09 18:51:22 +0100 |
commit | 3ddec016ffe5a624673b5c5d9573fb11851963b9 (patch) | |
tree | 798cf69b1aeeffb673a0aaad2a2a869f1224ebd6 /tox.ini | |
parent | Allow clients to supply access_tokens as headers (diff) | |
parent | Merge pull request #1096 from matrix-org/markjh/get_access_token (diff) | |
download | synapse-3ddec016ffe5a624673b5c5d9573fb11851963b9.tar.xz |
Merge branch 'develop' into markjh/bearer_token
Diffstat (limited to 'tox.ini')
0 files changed, 0 insertions, 0 deletions