diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-10-24 21:39:04 +0530 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-10-24 21:39:04 +0530 |
| commit | 6b41e0257a332de97777424e7c96cd9b8bb8db2b (patch) | |
| tree | eb3e71cc856adbc8f64188111a5437008c0f73c1 /actionmailer/CHANGELOG | |
| parent | 9ae15df21c3c3be4f46759b41a752f5b05333196 (diff) | |
| parent | a17fc20eb122d45a017e99e592e5e159025ab26b (diff) | |
| download | rails-6b41e0257a332de97777424e7c96cd9b8bb8db2b.tar.gz rails-6b41e0257a332de97777424e7c96cd9b8bb8db2b.tar.bz2 rails-6b41e0257a332de97777424e7c96cd9b8bb8db2b.zip | |
Merge commit 'mainstream/master'
Conflicts:
railties/doc/guides/html/2_2_release_notes.html
railties/doc/guides/source/2_2_release_notes.txt
Diffstat (limited to 'actionmailer/CHANGELOG')
| -rw-r--r-- | actionmailer/CHANGELOG | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index fc02ae8ffc..d8636fd83d 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,8 +1,11 @@ +*2.2.0 [RC1] (October 24th, 2008)* + * Add layout functionality to mailers [Pratik] Mailer layouts behaves just like controller layouts, except layout names need to have '_mailer' postfix for them to be automatically picked up. + *2.1.0 (May 31st, 2008)* * Fixed that a return-path header would be ignored #7572 [joost] |