diff options
author | Mike Gunderloy <MikeG1@larkfarm.com> | 2009-03-24 20:06:59 -0500 |
---|---|---|
committer | Mike Gunderloy <MikeG1@larkfarm.com> | 2009-03-24 20:06:59 -0500 |
commit | fab9d3b59dc87faec96aa01ce89402a9c3e57df8 (patch) | |
tree | fc40fe92aac64a926ba5edd868a031b28f320c61 /actionpack/Rakefile | |
parent | 4e27ca4c28432cd735a8ccb82bbaff37941a9d3b (diff) | |
parent | 0e6b9695aff6500ad48c4dd9ab61343d7090b030 (diff) | |
download | rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.gz rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.tar.bz2 rails-fab9d3b59dc87faec96aa01ce89402a9c3e57df8.zip |
Merge branch 'master' of git@github.com:lifo/docrails
Conflicts:
railties/guides/source/2_3_release_notes.textile
Diffstat (limited to 'actionpack/Rakefile')
-rw-r--r-- | actionpack/Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile index 2c0c28b755..6cacdf3c6e 100644 --- a/actionpack/Rakefile +++ b/actionpack/Rakefile @@ -80,7 +80,7 @@ spec = Gem::Specification.new do |s| s.has_rdoc = true s.requirements << 'none' - s.add_dependency('activesupport', '= 2.3.1' + PKG_BUILD) + s.add_dependency('activesupport', '= 2.3.2' + PKG_BUILD) s.require_path = 'lib' s.autorequire = 'action_controller' |