diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-05-22 20:11:36 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-05-22 20:11:36 -0500 |
| commit | 5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75 (patch) | |
| tree | dfadca323c6488c167d434e607caaf96c75c8a5c /activemodel | |
| parent | ba3ea9c90b000d8520944b51b2f6d41af148090c (diff) | |
| parent | 7ad24a7d962be62fc7538e8a9dc1046daf896497 (diff) | |
| download | rails-5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75.tar.gz rails-5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75.tar.bz2 rails-5e519fb0150e6ccb7e2486fc8aa2d60d11b53b75.zip | |
Merge branch '3-1-stable'
Conflicts:
actionpack/actionpack.gemspec
activemodel/activemodel.gemspec
Diffstat (limited to 'activemodel')
| -rw-r--r-- | activemodel/activemodel.gemspec | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activemodel/activemodel.gemspec b/activemodel/activemodel.gemspec index 30e308d8ad..562f07fcd7 100644 --- a/activemodel/activemodel.gemspec +++ b/activemodel/activemodel.gemspec @@ -18,5 +18,6 @@ Gem::Specification.new do |s| s.add_dependency('activesupport', version) s.add_dependency('builder', '~> 3.0.0') + s.add_dependency('i18n', '~> 0.6') s.add_dependency('bcrypt-ruby', '~> 2.1.4') end |