diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-02-03 22:49:56 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-02-03 22:49:56 +0000 |
| commit | c0eeb9f1e20af2a5c4f77c71fd1236e6c1584f05 (patch) | |
| tree | e92a7bfd6def8b7fce289476c406a8101f9a2681 /actionmailer | |
| parent | 9f030acf22696a476578e9ccde9984fa1b86f02c (diff) | |
| parent | 34a37ea9e8265972a93f0c4f62e44308c27751dd (diff) | |
| download | rails-c0eeb9f1e20af2a5c4f77c71fd1236e6c1584f05.tar.gz rails-c0eeb9f1e20af2a5c4f77c71fd1236e6c1584f05.tar.bz2 rails-c0eeb9f1e20af2a5c4f77c71fd1236e6c1584f05.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/action_mailer_basics.html
railties/doc/guides/html/getting_started_with_rails.html
railties/doc/guides/html/i18n.html
railties/doc/guides/source/action_mailer_basics.txt
railties/doc/guides/source/getting_started_with_rails.txt
railties/doc/guides/source/i18n.txt
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index 64124e06a8..ecfa25b0a0 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,4 +1,4 @@ -*2.3.0 [Edge]* +*2.3.0 [RC1] (February 1st, 2009)* * Fixed RFC-2045 quoted-printable bug #1421 [squadette] |