Merge branch 'main' of ssh://git.autonomic.zone:2222/coop-cloud/mastodon into main

This commit is contained in:
decentral1se 2021-05-28 13:04:53 +02:00
commit 8f473fda69
Signed by untrusted user who does not match committer: decentral1se
GPG Key ID: 92DAD76BD9567B8A

View File

@ -96,7 +96,6 @@ DEFAULT_LOCALE=en
# SMTP_SERVER= # SMTP_SERVER=
# SMTP_PORT= # SMTP_PORT=
# SMTP_LOGIN= # SMTP_LOGIN=
# SMTP_PASSWORD=
# SMTP_FROM_ADDRESS= # SMTP_FROM_ADDRESS=
# SMTP_DOMAIN= # SMTP_DOMAIN=
# SMTP_DELIVERY_METHOD= # SMTP_DELIVERY_METHOD=
@ -159,7 +158,6 @@ DEFAULT_LOCALE=en
# SAML_IDP_CERT_FINGERPRINT= # SAML_IDP_CERT_FINGERPRINT=
# SAML_NAME_IDENTIFIER_FORMAT= # SAML_NAME_IDENTIFIER_FORMAT=
# SAML_CERT= # SAML_CERT=
# SAML_PRIVATE_KEY=
# SAML_SECURITY_WANT_ASSERTION_SIGNED= # SAML_SECURITY_WANT_ASSERTION_SIGNED=
# SAML_SECURITY_WANT_ASSERTION_ENCRYPTED= # SAML_SECURITY_WANT_ASSERTION_ENCRYPTED=
# SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED= # SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED=