diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-31 14:32:26 +0000 |
| commit | ed60021f39f7913537dcad181e4061e423dc6c3d (patch) | |
| tree | 86532c43aabe9125422f84b48a899f2672900bf5 /actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb | |
| parent | c6af337d2d6c86792cdc8132224ebe9294d35774 (diff) | |
| parent | b3a028259f373fd58fea2171a1e9e8b2fe3e253a (diff) | |
| download | rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.gz rails-ed60021f39f7913537dcad181e4061e423dc6c3d.tar.bz2 rails-ed60021f39f7913537dcad181e4061e423dc6c3d.zip | |
Merge remote branch 'mainstream/master'
Conflicts:
activemodel/lib/active_model/state_machine.rb
Diffstat (limited to 'actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb')
| -rw-r--r-- | actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb b/actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb new file mode 100644 index 0000000000..a2187308b6 --- /dev/null +++ b/actionmailer/test/fixtures/base_mailer/email_custom_layout.text.html.erb @@ -0,0 +1 @@ +body_text
\ No newline at end of file |