diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-10-18 10:11:40 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-10-18 10:11:40 +0100 |
| commit | 80003dfcd503a72cb4da515b17c3765faccc2ce6 (patch) | |
| tree | 448fc279a9278566283721bb6a0c86f17efdbd36 /docs | |
| parent | changelog (diff) | |
| parent | Remove dead changelog file (diff) | |
| download | synapse-80003dfcd503a72cb4da515b17c3765faccc2ce6.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/event_auth/1
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/sample_config.yaml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml index 43893399ad..8226978ba6 100644 --- a/docs/sample_config.yaml +++ b/docs/sample_config.yaml @@ -1220,6 +1220,7 @@ saml2_config: # enabled: true # server_url: "https://cas-server.com" # service_url: "https://homeserver.domain.com:8448" +# #displayname_attribute: name # #required_attributes: # # name: value |