From 860e8e8a8f5bd90decc7dce735e09f4b4b33414a Mon Sep 17 00:00:00 2001 From: alec Date: Sat, 26 Nov 2011 14:31:50 +0000 Subject: - Fix merging some configuration options in update.sh script (#1485864) git-svn-id: https://svn.roundcube.net/trunk@5494 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/config/main.inc.php.dist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roundcubemail/config') diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist index 17d3c036c..e1d13ee73 100644 --- a/roundcubemail/config/main.inc.php.dist +++ b/roundcubemail/config/main.inc.php.dist @@ -657,8 +657,8 @@ $rcmail_config['pagesize'] = 40; // use this timezone to display date/time $rcmail_config['timezone'] = 'auto'; -// is daylight saving On? -$rcmail_config['dst_active'] = (bool)date('I'); +// is daylight saving On? Default: (bool)date('I'); +$rcmail_config['dst_active'] = null; // prefer displaying HTML messages $rcmail_config['prefer_html'] = true; -- cgit v1.2.3