diff options
author | Santiago Pastorino <santiago@wyeworks.com> | 2012-06-17 08:12:04 -0700 |
---|---|---|
committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-06-17 08:12:04 -0700 |
commit | 8690d5a4e3e684d13aed10f7b773f458fef33d01 (patch) | |
tree | 5b1827083b51e30370b4caf7cb6a4ad57a0ef6d6 | |
parent | 625c4959573c608140005425ff709422b35ba6a3 (diff) | |
parent | cbca13c98ba9b9f8202ddc1068d3dc2787154eed (diff) | |
download | rails-8690d5a4e3e684d13aed10f7b773f458fef33d01.tar.gz rails-8690d5a4e3e684d13aed10f7b773f458fef33d01.tar.bz2 rails-8690d5a4e3e684d13aed10f7b773f458fef33d01.zip |
Merge pull request #6760 from kennyj/bump_20120617
Bump tzinfo gem.
-rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
-rw-r--r-- | activesupport/activesupport.gemspec | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index ae26d6f9e5..938f3d6dc2 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -26,5 +26,5 @@ Gem::Specification.new do |s| s.add_dependency('journey', '~> 1.0.1') s.add_dependency('erubis', '~> 2.7.0') - s.add_development_dependency('tzinfo', '~> 0.3.29') + s.add_development_dependency('tzinfo', '~> 0.3.33') end diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 30221f2401..fa38d5c1e3 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -21,5 +21,5 @@ Gem::Specification.new do |s| s.add_dependency('i18n', '~> 0.6') s.add_dependency('multi_json', '~> 1.3') - s.add_dependency('tzinfo', '~> 0.3.31') + s.add_dependency('tzinfo', '~> 0.3.33') end |