summary refs log tree commit diff
path: root/synapse/config/__init__.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-03-27 20:18:56 +0000
committerRichard van der Hoff <richard@matrix.org>2020-04-03 11:16:41 +0100
commit8d4cbdeaa9765ae0d87ec82b053f12ed8162f6f5 (patch)
treebc029b6edf06d41a6ff93762b2d6fbf224601f16 /synapse/config/__init__.py
parentMerge tag 'v1.12.1' (diff)
downloadsynapse-8d4cbdeaa9765ae0d87ec82b053f12ed8162f6f5.tar.xz
Revert "Improve the UX of the login fallback when using SSO (#7152)"
This was incorrectly merged to `master` instead of develop.

This reverts commit 90246344e340bce3417fb330da6be9338a701c5c.
Diffstat (limited to 'synapse/config/__init__.py')
0 files changed, 0 insertions, 0 deletions