diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-26 09:32:57 -0700 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-03-26 09:32:57 -0700 |
| commit | 18a0d9f02b96a7d32ffa14cf16560ee3d5ee6cb2 (patch) | |
| tree | 472dda3011ff9704b6ea47bd1e06dfae71b9cd3f | |
| parent | 2d33796457b139a58539c890624591c97354d334 (diff) | |
| parent | d2a8f7e822573ecdad07ed31b9117fdc04382784 (diff) | |
| download | rails-18a0d9f02b96a7d32ffa14cf16560ee3d5ee6cb2.tar.gz rails-18a0d9f02b96a7d32ffa14cf16560ee3d5ee6cb2.tar.bz2 rails-18a0d9f02b96a7d32ffa14cf16560ee3d5ee6cb2.zip | |
Merge pull request #9937 from zolzaya/master
Asia/Ulaanbaatar is incorrect mapping
Fixes #9936
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 2 |
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 4b880cb5dc..21a0620c22 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -151,7 +151,7 @@ module ActiveSupport "Taipei" => "Asia/Taipei", "Perth" => "Australia/Perth", "Irkutsk" => "Asia/Irkutsk", - "Ulaan Bataar" => "Asia/Ulaanbaatar", + "Ulaanbaatar" => "Asia/Ulaanbaatar", "Seoul" => "Asia/Seoul", "Osaka" => "Asia/Tokyo", "Sapporo" => "Asia/Tokyo", |