aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/values
diff options
context:
space:
mode:
authorPhil Ross <phil.ross@gmail.com>2009-10-01 22:09:12 +0100
committerGeoff Buesing <gbuesing@gmail.com>2009-10-27 21:13:13 -0500
commit9b67b7ba2f74067235c8bd8f9dc02fb6337eda52 (patch)
tree5f553c6ad8ef6dfbfcfcce4171241b660ca7cc44 /activesupport/lib/active_support/values
parent057f0d3c16d533aea1a98ea3d7f4c2a09274e5c4 (diff)
downloadrails-9b67b7ba2f74067235c8bd8f9dc02fb6337eda52.tar.gz
rails-9b67b7ba2f74067235c8bd8f9dc02fb6337eda52.tar.bz2
rails-9b67b7ba2f74067235c8bd8f9dc02fb6337eda52.zip
Edinburgh TimeZone references "Europe/London" instead of "Europe/Dublin" [#3310 state:resolved]
Diffstat (limited to 'activesupport/lib/active_support/values')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index 564528bfe2..53a4c7acf5 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -63,7 +63,7 @@ module ActiveSupport
"Azores" => "Atlantic/Azores",
"Cape Verde Is." => "Atlantic/Cape_Verde",
"Dublin" => "Europe/Dublin",
- "Edinburgh" => "Europe/Dublin",
+ "Edinburgh" => "Europe/London",
"Lisbon" => "Europe/Lisbon",
"London" => "Europe/London",
"Casablanca" => "Africa/Casablanca",