diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-03-18 11:18:48 -0700 |
commit | 6335f5d5186dfb97453dfa1a55aabe4c6f3962b0 (patch) | |
tree | 1582b9b5d7e2005aaa2dfe5a23e2d422fe4f094e /actionmailer/lib | |
parent | 70e3dfb2e9f94396eb6525d13f9adccd3e845c3d (diff) | |
parent | dc88847e5ce392eed210b97525c14fca55852867 (diff) | |
download | rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.gz rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.tar.bz2 rails-6335f5d5186dfb97453dfa1a55aabe4c6f3962b0.zip |
Merge branch 'master' into bodyparts
Diffstat (limited to 'actionmailer/lib')
-rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index ac843ae6ac..08ff0d2ffb 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 = 3 - TINY = 1 + TINY = 2 STRING = [MAJOR, MINOR, TINY].join('.') end |