matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-07 21:23:00 +03:00
Code Activity

Merge pull request #6365 from psrpinto/fix/naming

Browse Source
This commit is contained in:
Germain
2021-07-15 08:07:03 +01:00
committed by GitHub
parent f990a595d1 4b6de3a011
commit c7c29f2119
17 changed files with 45 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/end-to-end-tests/synapse/config-templates/consent/homeserver.yaml
View File

@@ -572,11 +572,11 @@ uploads_path: "{{SYNAPSE_ROOT}}uploads"
## Captcha ##
# See docs/CAPTCHA_SETUP for full details of configuring this.
# This Home Server's ReCAPTCHA public key.
# This homeserver's ReCAPTCHA public key.
#
#recaptcha_public_key: "YOUR_PUBLIC_KEY"
# This Home Server's ReCAPTCHA private key.
# This homeserver's ReCAPTCHA private key.
#
#recaptcha_private_key: "YOUR_PRIVATE_KEY"
@@ -685,7 +685,7 @@ registration_shared_secret: "{{REGISTRATION_SHARED_SECRET}}"
# The list of identity servers trusted to verify third party
# identifiers by this server.
#
# Also defines the ID server which will be called when an account is
# Also defines the identity server which will be called when an account is
# deactivated (one will be picked arbitrarily).
#
#trusted_third_party_id_servers:
@@ -889,7 +889,7 @@ email:
smtp_user: "exampleusername"
smtp_pass: "examplepassword"
require_transport_security: False
notif_from: "Your Friendly %(app)s Home Server <noreply@example.com>"
notif_from: "Your Friendly %(app)s homeserver <noreply@example.com>"
app_name: Matrix
# if template_dir is unset, uses the example templates that are part of
# the Synapse distribution.