summary refs log tree commit diff
path: root/synapse/rest/admin/rooms.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-01-27 17:28:39 +0000
committerRichard van der Hoff <richard@matrix.org>2021-01-27 17:28:39 +0000
commit300d0d756a5a9a67d1838426d8b27eacd973b57a (patch)
tree2c56f5b63dcc3fe97aae730c85558d4a61a9bc01 /synapse/rest/admin/rooms.py
parentMerge branch 'social_login' into develop (diff)
parentMerge tag 'v1.26.0' into social_login (diff)
downloadsynapse-300d0d756a5a9a67d1838426d8b27eacd973b57a.tar.xz
Merge branch 'social_login' into develop
Diffstat (limited to 'synapse/rest/admin/rooms.py')
0 files changed, 0 insertions, 0 deletions