diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-26 14:31:50 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2011-11-26 14:31:50 +0000 |
| commit | 860e8e8a8f5bd90decc7dce735e09f4b4b33414a (patch) | |
| tree | c9fef9925bff934b0ada7f26577bb2b90b90ffe9 /roundcubemail/config | |
| parent | 3f73b9ac89a991f1ffa46da2ea6c0cb63e054d70 (diff) | |
- Fix merging some configuration options in update.sh script (#1485864)
git-svn-id: https://svn.roundcube.net/trunk@5494 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/config')
| -rw-r--r-- | roundcubemail/config/main.inc.php.dist | 4 |
1 files changed, 2 insertions, 2 deletions
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; |