diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-10-24 14:13:00 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 14:13:00 +0300 |
| commit | e02c140650f2b0a1fda675e95fe975186efb35b6 (patch) | |
| tree | 6c831280b18b3fddf4e8991d42e411ae946ff6d4 | |
| parent | f1cb3ac4097d4f28437f154e479b289e113a247a (diff) | |
| parent | e8d0145318190747111cdb06ae42654d8f345cac (diff) | |
Merge pull request #26458 from owncloud/stable8.1-da79d9affbf1cd3a2e30c5226e143b2ecb9c3105
[stable8.1] Fix misleading SSL/TLS SMTP email configuration (#26447)
| -rw-r--r-- | settings/templates/admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 4e7e3cac8cf..fc4295d47d1 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -34,8 +34,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 = [ |