summary refs log tree commit diff
path: root/synapse/rest/admin.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-03 14:58:37 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-03-03 14:58:37 +0000
commitfe6ab0439d4fabf166fa74def4ebbf9a9db054b6 (patch)
tree90a5a82c909bacc82b010056c59458d29e755a6f /synapse/rest/admin.py
parentMerge branch 'babolivier/complete_sso_login_saml' into 'release-v1.11.1' (diff)
parentv1.11.1 (diff)
downloadsynapse-fe6ab0439d4fabf166fa74def4ebbf9a9db054b6.tar.xz
Merge branch 'babolivier/v1.11.1-changelog' into 'release-v1.11.1'
v1.11.1

See merge request new-vector/synapse!6
Diffstat (limited to 'synapse/rest/admin.py')
0 files changed, 0 insertions, 0 deletions