From 8defdaf0b1864f8e420be65823c0bf72426254cc Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 27 Feb 2015 07:03:57 -0500
Subject: [PATCH] Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293)
---
CHANGELOG | 1 +
program/lib/Roundcube/rcube_config.php | 1 -
2 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9175dbf..d8d7fca 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@
- Fix security issue in DBMail driver of password plugin (#1490261)
- Fix handling of some improper constructs in format=flowed text as per the RFC3676[4.5] (#1490284)
- Fix missing or not up-to-date CATEGORIES entry in vCard export (#1490277)
+- Fix duplicate entry on timezones list in rcube_config::timezone_name_from_abbr() (#1490293)
RELEASE 1.0.5
-------------
diff --git a/program/lib/Roundcube/rcube_config.php b/program/lib/Roundcube/rcube_config.php
index afe13e8..06230f6 100644
--- a/program/lib/Roundcube/rcube_config.php
+++ b/program/lib/Roundcube/rcube_config.php
@@ -581,7 +581,6 @@
'180' => "Europe/Moscow",
'210' => "Asia/Tehran",
'240' => "Asia/Dubai",
- '300' => "Asia/Karachi",
'270' => "Asia/Kabul",
'300' => "Asia/Karachi",
'330' => "Asia/Kolkata",
--
Gitblit v1.9.1