aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-09-30 22:56:37 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-09-30 22:56:37 +0000
commit6ca789bf005caadd4200b6bf788521dfe1d40287 (patch)
treebd4ef4146e814c4c8183e2130b9282b1989750b3 /activesupport/lib/active_support
parent81da956188037b3045fae73726a372f4951ca0c4 (diff)
downloadrails-6ca789bf005caadd4200b6bf788521dfe1d40287.tar.gz
rails-6ca789bf005caadd4200b6bf788521dfe1d40287.tar.bz2
rails-6ca789bf005caadd4200b6bf788521dfe1d40287.zip
Fixed that La Paz was included in -25200 and -14400 offsets when it should only be in -14400 (closes #9735) [bermi]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7700 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/values/time_zone.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb
index ab9e2cfde8..71e8528ae1 100644
--- a/activesupport/lib/active_support/values/time_zone.rb
+++ b/activesupport/lib/active_support/values/time_zone.rb
@@ -98,8 +98,8 @@ class TimeZone
[-36_000, "Hawaii" ],
[-32_400, "Alaska" ],
[-28_800, "Pacific Time (US & Canada)", "Tijuana" ],
- [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "La Paz",
- "Mazatlan", "Arizona" ],
+ [-25_200, "Mountain Time (US & Canada)", "Chihuahua", "Mazatlan",
+ "Arizona" ],
[-21_600, "Central Time (US & Canada)", "Saskatchewan", "Guadalajara",
"Mexico City", "Monterrey", "Central America" ],
[-18_000, "Eastern Time (US & Canada)", "Indiana (East)", "Bogota",