diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:44:58 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-09-03 17:44:58 +0100 |
| commit | 2933f4481f8b70b3b809fab6e818d80c2af1b919 (patch) | |
| tree | c83d1308545cc82215b90ab37208cc81b4712276 /actionmailer/CHANGELOG | |
| parent | 36ee17d458b86c5f3f371810160e8839d318bbf1 (diff) | |
| parent | 10fe6a6d8940300dd6698ec38e9c9573404e687d (diff) | |
| download | rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.gz rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.tar.bz2 rails-2933f4481f8b70b3b809fab6e818d80c2af1b919.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionmailer/CHANGELOG')
| -rw-r--r-- | actionmailer/CHANGELOG | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionmailer/CHANGELOG b/actionmailer/CHANGELOG index bdae0d4d3d..fc02ae8ffc 100644 --- a/actionmailer/CHANGELOG +++ b/actionmailer/CHANGELOG @@ -1,3 +1,8 @@ +* 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] |