Merge remote-tracking branch 'upstream/master' into extend-nginx

2018-12-07 16:48:50 +02:00
parent 97d338e68a 7f46876b0c
commit c00910ca4b
85 changed files with 2283 additions and 645 deletions
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -250,7 +250,7 @@ mail {
      listen 465 ssl;
      listen [::]:465 ssl;
      protocol smtp;
-      smtp_auth plain;
+      smtp_auth plain login;
    }

    server {