Merged updates from trunk into stable branch

[feedcatcher.git] / vendor / rails / actionmailer / test / fixtures / auto_layout_mailer / multipart.text.html.erb

diff --git a/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb b/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb
new file mode 100644 (file)
index 0000000..6d73f19
--- /dev/null
+++ b/vendor/rails/actionmailer/test/fixtures/auto_layout_mailer/multipart.text.html.erb
@@ -0,0 +1 @@
+text/html multipart
\ No newline at end of file