summary refs log tree commit diff
path: root/synapse/api/auth.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-08-16 15:51:16 +0100
committerErik Johnston <erik@matrix.org>2018-08-16 15:51:16 +0100
commitbb795b56da85580b630f20fed00043e7c175dcc8 (patch)
tree232f0fb3f39947df3cdf811673db188645a541e4 /synapse/api/auth.py
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentMerge pull request #3705 from matrix-org/erikj/fix_inbound_fed_worker (diff)
downloadsynapse-bb795b56da85580b630f20fed00043e7c175dcc8.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/auth.py')
0 files changed, 0 insertions, 0 deletions