diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-09 14:15:29 -0800 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-03-09 14:15:29 -0800 |
| commit | f56cdbdfb2cb0f9f989b377b21d6d30d3d4f7d03 (patch) | |
| tree | e7024038ea56ae813a6ab190e9399cb03078cbbc /activesupport | |
| parent | bbc87dbc81eecd48567ab06810c6d5d8d9be5573 (diff) | |
| parent | 0bfaa2cc9cfad62f63d8f5410bdf1745351d7546 (diff) | |
| download | rails-f56cdbdfb2cb0f9f989b377b21d6d30d3d4f7d03.tar.gz rails-f56cdbdfb2cb0f9f989b377b21d6d30d3d4f7d03.tar.bz2 rails-f56cdbdfb2cb0f9f989b377b21d6d30d3d4f7d03.zip | |
Merge pull request #9637 from GSI/master
Include Montevideo time zone in list of aliases. Closes #9628
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/values/time_zone.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/values/time_zone.rb b/activesupport/lib/active_support/values/time_zone.rb index c5fbddcb5f..002f57f4bb 100644 --- a/activesupport/lib/active_support/values/time_zone.rb +++ b/activesupport/lib/active_support/values/time_zone.rb @@ -62,6 +62,7 @@ module ActiveSupport "Newfoundland" => "America/St_Johns", "Brasilia" => "America/Sao_Paulo", "Buenos Aires" => "America/Argentina/Buenos_Aires", + "Montevideo" => "America/Montevideo", "Georgetown" => "America/Guyana", "Greenland" => "America/Godthab", "Mid-Atlantic" => "Atlantic/South_Georgia", |