summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2016-06-03 16:56:27 +0100
committerDavid Baker <dave@matrix.org>2016-06-03 16:56:27 +0100
commit0e2ed5445b4fc0931fde28b49975539b9d56b5b3 (patch)
treee6dc0b512288edd5b91dd6b53ed477fe00f619ba /synapse/api/auth.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into erikj/timings (diff)
parentMerge pull request #834 from matrix-org/dbkr/fix_email_from (diff)
downloadsynapse-0e2ed5445b4fc0931fde28b49975539b9d56b5b3.tar.xz
Merge remote-tracking branch 'origin/develop' into erikj/timings
Diffstat (limited to 'synapse/api/auth.py')
0 files changed, 0 insertions, 0 deletions