diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2016-10-24 14:12:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-24 14:12:52 +0300 |
| commit | 3ebcba310c8aa8790d6796269d750d280edfc391 (patch) | |
| tree | 1c97b1ec9546eb7586870988207e4f9124aa83d6 | |
| parent | 1a4621ded1c139e5cbea68da9c15062cbf31b7c3 (diff) | |
| parent | 39627d39c2b753e9755b23499cf298e96fd92e12 (diff) | |
Merge pull request #26457 from owncloud/stable8.2-da79d9affbf1cd3a2e30c5226e143b2ecb9c3105
[stable8.2] 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 c45057688ee..5f639dae4b8 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 = [ |