diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:26:44 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-05-31 11:26:44 -0700 |
| commit | 4df968071436a4585c8e4694efecfabb02f1a806 (patch) | |
| tree | 45ea5201ff32a6063aa24fb90e9ba7f8b8715db0 /actionmailer | |
| parent | d66fd081759af32e57baabf7888823cfd9bcebd0 (diff) | |
| parent | febd65223e2b3a40755d23a734f6a77e04b97c88 (diff) | |
| download | rails-4df968071436a4585c8e4694efecfabb02f1a806.tar.gz rails-4df968071436a4585c8e4694efecfabb02f1a806.tar.bz2 rails-4df968071436a4585c8e4694efecfabb02f1a806.zip | |
Merge branch '3-2-rel' into 3-2-stable
* 3-2-rel:
bumping to 3.2.4
adding security notifications to CHANGELOGs
updating changelogs
Merge pull request #6558 from parndt/fix_regression
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index bd75a27335..58dc6b8ab4 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -1,3 +1,7 @@ +## Rails 3.2.4 (May 31, 2012) ## + +* No changes. + ## Rails 3.2.3 (March 30, 2012) ## * Upgrade mail version to 2.4.3 *ML* diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index f03bb5f169..0f3cfedfbb 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -3,7 +3,7 @@ module ActionMailer MAJOR = 3 MINOR = 2 TINY = 4 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |