diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-21 02:30:57 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-10-21 02:30:57 +0200 |
| commit | 68d84e259346c1bc3d8fd546162e5a93caf0bbdc (patch) | |
| tree | 60f6e71fcb669eb0f9b6b0bc70fa5c2a81a103f6 /activesupport | |
| parent | 9acb88e666269204821b78bec7b72d3d16597096 (diff) | |
| parent | 326030a1e843245ae493fbdfb1b5eb72d1e59f26 (diff) | |
| download | rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.gz rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.bz2 rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/vendor.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb index c703ac0f3e..633eb2ef08 100644 --- a/activesupport/lib/active_support/vendor.rb +++ b/activesupport/lib/active_support/vendor.rb @@ -22,7 +22,7 @@ end begin gem 'tzinfo', '~> 0.3.11' rescue Gem::LoadError - $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.9" + $:.unshift "#{File.dirname(__FILE__)}/vendor/tzinfo-0.3.11" end # TODO I18n gem has not been released yet |