summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-11-26 14:31:50 +0000
committeralecpl <alec@alec.pl>2011-11-26 14:31:50 +0000
commit0829b76598425f0319014fe5a3bbc08333a59961 (patch)
tree0755e57cee94e6dd201615c97fab904b70f6ba49 /config
parent3e5c709fa719e2458df06e515fa4893ae743edda (diff)
- Fix merging some configuration options in update.sh script (#1485864)
Diffstat (limited to 'config')
-rw-r--r--config/main.inc.php.dist4
1 files changed, 2 insertions, 2 deletions
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;