Merge branch 'stable' into develop

This commit is contained in:
Georg Krause 2022-04-23 14:04:53 +02:00
commit af5e2d31ea
No known key found for this signature in database
GPG key ID: 2970D504B2183D22
13 changed files with 522 additions and 592 deletions

View file

@ -335,9 +335,9 @@ SMTP configuration for sending e-mails. Possible values:
On a production instance, you'll usually want to use an external SMTP server:
- ``EMAIL_CONFIG=smtp://user@:password@youremail.host:25``
- ``EMAIL_CONFIG=smtp+ssl://user@:password@youremail.host:465``
- ``EMAIL_CONFIG=smtp+tls://user@:password@youremail.host:587``
- ``EMAIL_CONFIG=smtp://user:password@youremail.host:25``
- ``EMAIL_CONFIG=smtp+ssl://user:password@youremail.host:465``
- ``EMAIL_CONFIG=smtp+tls://user:password@youremail.host:587``
.. note::