aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/activesupport.gemspec
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2012-04-16 06:48:01 -0700
committerPiotr Sarnacki <drogus@gmail.com>2012-04-16 06:48:01 -0700
commitfd12fe65044b504554a36ae886f336d3ec554fe8 (patch)
treee8b400fb694e8010c1bf0b1c519b874800944b67 /activesupport/activesupport.gemspec
parent039a118857975fa4495a3728d97c65c5d91a8a87 (diff)
parent57baa0e97aa4b444706007fe5b9e9ecb5e462df5 (diff)
downloadrails-fd12fe65044b504554a36ae886f336d3ec554fe8.tar.gz
rails-fd12fe65044b504554a36ae886f336d3ec554fe8.tar.bz2
rails-fd12fe65044b504554a36ae886f336d3ec554fe8.zip
Merge pull request #5860 from arunagw/multi_json_upgrade_fix
fixed broken build after multi_json upgrade
Diffstat (limited to 'activesupport/activesupport.gemspec')
-rw-r--r--activesupport/activesupport.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec
index d26d71b615..4228a24d5e 100644
--- a/activesupport/activesupport.gemspec
+++ b/activesupport/activesupport.gemspec
@@ -19,6 +19,6 @@ 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')
+ s.add_dependency('multi_json', '~> 1.3.0')
s.add_dependency('tzinfo', '~> 0.3.31')
end