aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErik Michaels-Ober <sferik@gmail.com>2012-04-18 19:54:19 -0700
committerErik Michaels-Ober <sferik@gmail.com>2012-04-18 19:54:19 -0700
commite01bf0a78acbdfc4635a2bbde88f5d530350fdc5 (patch)
treef9bf32fb85215c96a1237cd24f8757aa087661ae
parent1166d49f62ccab789be208112163ad13183224e2 (diff)
downloadrails-e01bf0a78acbdfc4635a2bbde88f5d530350fdc5.tar.gz
rails-e01bf0a78acbdfc4635a2bbde88f5d530350fdc5.tar.bz2
rails-e01bf0a78acbdfc4635a2bbde88f5d530350fdc5.zip
Revert "multi_json is restricted to < 1.3 "
This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b.
-rw-r--r--activesupport/activesupport.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index 696f2ca803..e6fc7bf571 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -19,5 +19,5 @@ Gem::Specification.new do |s|
s.rdoc_options.concat ['--encoding', 'UTF-8']
s.add_dependency('i18n', '~> 0.6')
- s.add_dependency('multi_json', '>= 1.0', '< 1.3')
+ s.add_dependency('multi_json', '~> 1.0')
end