summary refs log tree commit diff
path: root/synapse/config/cas.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
committerRichard van der Hoff <richard@matrix.org>2019-02-20 14:15:56 +0000
commit4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9 (patch)
tree43ac96a5b91bbc498228f44798cdc260de1f47c0 /synapse/config/cas.py
parentApply the pusher http hack in the right place (#4692) (diff)
parentLogging improvements for the pusher (#4691) (diff)
downloadsynapse-4da63d9f6fc404b00d8c39b200f9f67c29d5dfa9.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/config/cas.py')
-rw-r--r--synapse/config/cas.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/cas.py b/synapse/config/cas.py

index 8109e5f95e..609c0815c8 100644 --- a/synapse/config/cas.py +++ b/synapse/config/cas.py
@@ -38,6 +38,7 @@ class CasConfig(Config): def default_config(self, config_dir_path, server_name, **kwargs): return """ # Enable CAS for registration and login. + # #cas_config: # enabled: true # server_url: "https://cas-server.com"