summary refs log tree commit diff
path: root/synapse/streams
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-01-28 17:19:28 +0000
committerMark Haines <mjark@negativecurvature.net>2015-01-28 17:19:28 +0000
commit26c8fff19ebfca3914305f820b29897db8ea4fca (patch)
treec346408ce8f8ced5d1cb2e8dce4ea7fb934bb37e /synapse/streams
parentMerge branch 'master' into develop (diff)
parentRename ClientID to ClientInfo since it is a pair of IDs rather than a single ... (diff)
downloadsynapse-26c8fff19ebfca3914305f820b29897db8ea4fca.tar.xz
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
Diffstat (limited to 'synapse/streams')
0 files changed, 0 insertions, 0 deletions