diff options
author | Richard van der Hoff <richard@matrix.org> | 2021-01-27 17:27:24 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2021-01-27 17:27:24 +0000 |
commit | 7fa1346f9323222b19c5ab7c50b354099684788f (patch) | |
tree | 2c56f5b63dcc3fe97aae730c85558d4a61a9bc01 /synapse/rest/admin/rooms.py | |
parent | Merge branch 'master' into develop (diff) | |
parent | Implement MSC2858 support (#9183) (diff) | |
download | synapse-7fa1346f9323222b19c5ab7c50b354099684788f.tar.xz |
Merge branch 'social_login' into develop
Diffstat (limited to 'synapse/rest/admin/rooms.py')
0 files changed, 0 insertions, 0 deletions