From 0829b76598425f0319014fe5a3bbc08333a59961 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 26 Nov 2011 14:31:50 +0000
Subject: - Fix merging some configuration options in update.sh script
 (#1485864)

---
 config/main.inc.php.dist | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config')

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 17d3c036c..e1d13ee73 100644
--- a/config/main.inc.php.dist
+++ b/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