aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-15 11:15:08 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-15 11:15:08 -0700
commiteb8807e84dff1b726051946bf09336f36aaae93e (patch)
treec264f198a4e76f29609fd399efb08f56a86a729d /actionmailer/lib/action_mailer
parentbefeeb2d0aef8db4ba84d1e2fa0d273f8a111363 (diff)
parente3abd78ee58ee8564a69c989e963ae480b8acf9f (diff)
downloadrails-eb8807e84dff1b726051946bf09336f36aaae93e.tar.gz
rails-eb8807e84dff1b726051946bf09336f36aaae93e.tar.bz2
rails-eb8807e84dff1b726051946bf09336f36aaae93e.zip
Merge branch '3-2-15' into 3-2-sec
* 3-2-15: bumping to rc3 Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build" Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target" bumping to rc2 Merge pull request #12443 from arthurnn/add_inverse_of_add_target bumping version to 3.2.15.rc1 Fix STI scopes using benolee's suggestion. Fixes #11939
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r--actionmailer/lib/action_mailer/version.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb
index 6f596710d4..145eb38dce 100644
--- a/actionmailer/lib/action_mailer/version.rb
+++ b/actionmailer/lib/action_mailer/version.rb
@@ -2,8 +2,8 @@ module ActionMailer
module VERSION #:nodoc:
MAJOR = 3
MINOR = 2
- TINY = 14
- PRE = nil
+ TINY = 15
+ PRE = "rc3"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
end