diff options
| author | Aleksander Machniak <alec@alec.pl> | 2015-02-27 13:02:01 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2015-02-27 13:02:01 +0100 |
| commit | a4ef49d6cf5814c2dabdaeb2397fb187769b6cb4 (patch) | |
| tree | 13ca919d7a9c4ff4c52a45687d94241219509136 | |
| parent | f27c6c8c4423c130d9929daeea408c8e218ecc2c (diff) | |
Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_config.php | 1 |
2 files changed, 1 insertions, 1 deletions
@@ -20,6 +20,7 @@ CHANGELOG Roundcube Webmail - Fix duplicate entries supression in autocomplete result (#1490290) - Fix "Non-static method PEAR::isError() should not be called statically" errors (#1490281) - Fix parsing invalid HTML messages with BOM after <!DOCTYPE> (#1490291) +- Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293) RELEASE 1.1.0 ------------- diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php index 89e45449d..e80474af2 100644 --- a/program/lib/Roundcube/rcube_config.php +++ b/program/lib/Roundcube/rcube_config.php @@ -683,7 +683,6 @@ class rcube_config '180' => "Europe/Moscow", '210' => "Asia/Tehran", '240' => "Asia/Dubai", - '300' => "Asia/Karachi", '270' => "Asia/Kabul", '300' => "Asia/Karachi", '330' => "Asia/Kolkata", |