diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-10-24 13:30:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 13:30:54 +0200 |
| commit | 24786d5c5173d3db6000ccde4c0b14d6a869ebe0 (patch) | |
| tree | 36ad624a1a0173a2dbb83ad50d2c6a754faee688 | |
| parent | f054adb4291c83b05777688360780146af5f7d94 (diff) | |
| parent | d0d7767366326ba34da78bb077ef23b1e7ada765 (diff) | |
| download | nextcloud-server-24786d5c5173d3db6000ccde4c0b14d6a869ebe0.tar.gz nextcloud-server-24786d5c5173d3db6000ccde4c0b14d6a869ebe0.zip | |
Merge pull request #1872 from nextcloud/ds-26447-misleading-ssl-config
Fix misleading SSL/TLS SMTP email configuration
| -rw-r--r-- | settings/templates/admin/additional-mail.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/templates/admin/additional-mail.php b/settings/templates/admin/additional-mail.php index 88eec421ec5..23723a423c0 100644 --- a/settings/templates/admin/additional-mail.php +++ b/settings/templates/admin/additional-mail.php @@ -33,8 +33,8 @@ $mail_smtpauthtype = [ $mail_smtpsecure = [ '' => $l->t('None'), - 'ssl' => $l->t('SSL'), - 'tls' => $l->t('TLS'), + 'ssl' => $l->t('SSL/TLS'), + 'tls' => $l->t('STARTTLS'), ]; $mail_smtpmode = [ |