Merge branch 'master' of github.com:roundcube/roundcubemail

12 years ago · 976ba376a9
parent d764723142 3bbe4e7424
commit 976ba376a9
1 changed files with 2 additions and 0 deletions
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@ -179,6 +179,8 @@ $rcmail_config['smtp_auth_pw'] = null;
 $rcmail_config['smtp_helo_host'] = '';
 // SMTP connection timeout, in seconds. Default: 0 (no limit)
 // Note: There's a known issue where using ssl connection with
 // timeout > 0 causes connection errors (https://bugs.php.net/bug.php?id=54511)
 $rcmail_config['smtp_timeout'] = 0;
 // ----------------------------------