Merge branch 'develop' of github.com:matrix-org/synapse into neilj/disable-mau-alerting-for-small-instances

2019-10-18 13:45:27 +01:00
parent 49b4f9633c 560c122267
commit d186657bbf
38 changed files with 298 additions and 195 deletions
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -1227,6 +1227,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