diff options
| author | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
|---|---|---|
| committer | rick <rick@spacemonkey.local> | 2008-05-13 09:41:10 -0700 |
| commit | 74fd17346f30fddba0e174ae17f5697f2c22279e (patch) | |
| tree | 1267cea613ee4a73a2f5ddf3fb24d224dc8bbded /actionmailer | |
| parent | d09a8446d5606a5a0b5c024224b09a1318e9cf4d (diff) | |
| parent | 4dedc7ddcaffa8c606af11ae2d32707131b99a2e (diff) | |
| download | rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.gz rails-74fd17346f30fddba0e174ae17f5697f2c22279e.tar.bz2 rails-74fd17346f30fddba0e174ae17f5697f2c22279e.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionmailer/MIT-LICENSE | 2 | ||||
| -rwxr-xr-x | actionmailer/Rakefile | 2 | ||||
| -rwxr-xr-x | actionmailer/lib/action_mailer.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 15c9964d9b..b2ce462f0c 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,4 +1,4 @@ -*SVN* +*2.1.0 RC1 (May 11th, 2008)* * Fixed that a return-path header would be ignored #7572 [joost] diff --git a/actionmailer/MIT-LICENSE b/actionmailer/MIT-LICENSE index 007cc942e1..13c90d46e9 100644 --- a/actionmailer/MIT-LICENSE +++ b/actionmailer/MIT-LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2004-2007 David Heinemeier Hansson +Copyright (c) 2004-2008 David Heinemeier Hansson Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/actionmailer/Rakefile b/actionmailer/Rakefile index 75c3eb2db9..22ed396417 100755 --- a/actionmailer/Rakefile +++ b/actionmailer/Rakefile @@ -55,7 +55,7 @@ spec = Gem::Specification.new do |s| s.rubyforge_project = "actionmailer" s.homepage = "http://www.rubyonrails.org" - s.add_dependency('actionpack', '= 2.0.2' + PKG_BUILD) + s.add_dependency('actionpack', '= 2.0.991' + PKG_BUILD) s.has_rdoc = true s.requirements << 'none' diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb index ec803f5a8e..2e324d4637 100755 --- a/actionmailer/lib/action_mailer.rb +++ b/actionmailer/lib/action_mailer.rb @@ -1,5 +1,5 @@ #-- -# Copyright (c) 2004-2007 David Heinemeier Hansson +# Copyright (c) 2004-2008 David Heinemeier Hansson # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 954a472757..88b9a3c200 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -2,7 +2,7 @@ module ActionMailer module VERSION #:nodoc: MAJOR = 2 MINOR = 0 - TINY = 2 + TINY = 991 STRING = [MAJOR, MINOR, TINY].join('.') end |