diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-30 20:12:17 -0300 |
| commit | e5b8c4483c8de805d5847563edcf4e5d7e035a87 (patch) | |
| tree | 00f579d40ce23c5ebb0a3386ca5c00d22406bbd6 /actionmailer/lib | |
| parent | 9c70442534c7754eac3738e0ddf11446b01c4f9e (diff) | |
| parent | db3de78a83379ab2a58e0d29fb10622b813a4d44 (diff) | |
| download | rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.gz rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.tar.bz2 rails-e5b8c4483c8de805d5847563edcf4e5d7e035a87.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record/base.rb
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/version.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/version.rb b/actionmailer/lib/action_mailer/version.rb index 08ff0d2ffb..0f2b58552b 100644 --- a/actionmailer/lib/action_mailer/version.rb +++ b/actionmailer/lib/action_mailer/version.rb @@ -1,8 +1,8 @@ module ActionMailer module VERSION #:nodoc: - MAJOR = 2 - MINOR = 3 - TINY = 2 + MAJOR = 3 + MINOR = 0 + TINY = "pre" STRING = [MAJOR, MINOR, TINY].join('.') end |