summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-03-03 10:54:44 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-03-03 10:54:44 +0000
commit6f67a8b570b667da2c97018a26938de86b29e7d9 (patch)
tree9a348a434d7cd9493da3dc3ff306aa331fc0ad42 /synapse/config
parentMerge branch 'rav/sso-confirm-whitelist' into 'release-v1.11.1' (diff)
parentFactor out complete_sso_login and expose it to the Module API (diff)
downloadsynapse-6f67a8b570b667da2c97018a26938de86b29e7d9.tar.xz
Merge branch 'babolivier/sso_module_api' into 'release-v1.11.1'
Factor out complete_sso_login and expose it to the Module API

See merge request new-vector/synapse!4
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/sso.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/sso.py b/synapse/config/sso.py
index 56299bd4e4..95762689bc 100644
--- a/synapse/config/sso.py
+++ b/synapse/config/sso.py
@@ -16,7 +16,7 @@ from typing import Any, Dict
 
 import pkg_resources
 
-from ._base import Config, ConfigError
+from ._base import Config
 
 
 class SSOConfig(Config):