diff options
author | Jon Leighton <j@jonathanleighton.com> | 2012-07-17 15:20:45 -0700 |
---|---|---|
committer | Jon Leighton <j@jonathanleighton.com> | 2012-07-17 15:20:45 -0700 |
commit | d00b635242120f4262178909d93faf4473b1055e (patch) | |
tree | 8cf8e7908ed9b93d1a8786396a8d59c993558e87 /actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb | |
parent | d8745decaf59aad32aa2f09abdba99b8d0e48b31 (diff) | |
parent | 80f61259f927e5e37e7f7b0ce0da44da1dc84efe (diff) | |
download | rails-d00b635242120f4262178909d93faf4473b1055e.tar.gz rails-d00b635242120f4262178909d93faf4473b1055e.tar.bz2 rails-d00b635242120f4262178909d93faf4473b1055e.zip |
Merge pull request #7081 from jfirebaugh/to_param_regression_master
AR::Integration must be included after AM::Conversion
Diffstat (limited to 'actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb')
0 files changed, 0 insertions, 0 deletions