Merged updates from trunk into stable branch

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

diff --git a/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb b/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb
new file mode 100644 (file)
index 0000000..111576b
--- /dev/null
+++ b/vendor/rails/actionmailer/test/fixtures/layouts/auto_layout_mailer.text.erb
@@ -0,0 +1 @@
+text/plain layout - <%= yield %>
\ No newline at end of file