diff options
| author | friendica <info@friendica.com> | 2011-12-25 19:14:45 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2011-12-25 19:14:45 -0800 |
| commit | 205dcd8f5bd01feedd8877581876ec7253b4c15a (patch) | |
| tree | 208bbdb1a877b07bd7a88f9a78da7bcadadfc364 | |
| parent | 170b8418342fc8bd614478dd673691384e411da2 (diff) | |
| parent | 629a69f9dc96ceefeedb72927ed87ba26deac451 (diff) | |
| download | volse-hubzilla-205dcd8f5bd01feedd8877581876ec7253b4c15a.tar.gz volse-hubzilla-205dcd8f5bd01feedd8877581876ec7253b4c15a.tar.bz2 volse-hubzilla-205dcd8f5bd01feedd8877581876ec7253b4c15a.zip | |
Merge branch 'master' into notify
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | mod/settings.php | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1204' ); +define ( 'FRIENDICA_VERSION', '2.3.1206' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DB_UPDATE_VERSION', 1112 ); diff --git a/mod/settings.php b/mod/settings.php index ad22ba1a6..35902f831 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -574,7 +574,7 @@ function settings_content(&$a) { '$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''), '$mail_server' => array('mail_server', t('IMAP server name:'), $mail_server, ''), '$mail_port' => array('mail_port', t('IMAP port:'), $mail_port, ''), - '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TSL'=>'TSL', 'SSL'=>'SSL')), + '$mail_ssl' => array('mail_ssl', t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')), '$mail_user' => array('mail_user', t('Email login name:'), $mail_user, ''), '$mail_pass' => array('mail_pass', t('Email password:'), '', ''), '$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'), |