diff options
| author | Rizwan Reza <rizwanreza@gmail.com> | 2010-03-28 12:04:00 +0430 |
|---|---|---|
| committer | Rizwan Reza <rizwanreza@gmail.com> | 2010-03-28 12:04:00 +0430 |
| commit | b4c91de9462f59d6395c7c871aafa3301afdc383 (patch) | |
| tree | fadcaf603a6f473e8ccd52070a1f3b4f957c34cb /actionmailer/test/fixtures | |
| parent | 4b4f69b9bfbd33556e23262f57cf6d944dfd9f63 (diff) | |
| parent | 66d57d7ba83df52ff1e0485c89f6192c2f84c6b8 (diff) | |
| download | rails-b4c91de9462f59d6395c7c871aafa3301afdc383.tar.gz rails-b4c91de9462f59d6395c7c871aafa3301afdc383.tar.bz2 rails-b4c91de9462f59d6395c7c871aafa3301afdc383.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionmailer/test/fixtures')
| -rw-r--r-- | actionmailer/test/fixtures/base_mailer/explicit_multipart_with_one_template.erb | 1 | ||||
| -rw-r--r-- | actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb (renamed from actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/test/fixtures/base_mailer/explicit_multipart_with_one_template.erb b/actionmailer/test/fixtures/base_mailer/explicit_multipart_with_one_template.erb new file mode 100644 index 0000000000..8a69657b08 --- /dev/null +++ b/actionmailer/test/fixtures/base_mailer/explicit_multipart_with_one_template.erb @@ -0,0 +1 @@ +<%= self.formats.inspect %>
\ No newline at end of file diff --git a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb b/actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb index 4c5806d30d..4c5806d30d 100644 --- a/actionmailer/test/fixtures/test_mailer/signed_up_with_url.erb +++ b/actionmailer/test/fixtures/url_test_mailer/signed_up_with_url.erb |