diff options
author | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
---|---|---|
committer | Pratik Naik <pratiknaik@gmail.com> | 2010-01-04 03:24:39 +0530 |
commit | cda36a0731f14b33a920bf7e32255661e06f890a (patch) | |
tree | 79ccba37953f9fe3055503be42b1610faa6d64ad /actionmailer/test/fixtures | |
parent | bd4a3cce4ecd8e648179a91e26506e3622ac2162 (diff) | |
parent | a115b5d79a850bb56cd3c9db9a05d6da35e3d7be (diff) | |
download | rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.gz rails-cda36a0731f14b33a920bf7e32255661e06f890a.tar.bz2 rails-cda36a0731f14b33a920bf7e32255661e06f890a.zip |
Merge remote branch 'mainstream/master'
Diffstat (limited to 'actionmailer/test/fixtures')
-rw-r--r-- | actionmailer/test/fixtures/attachments/foo.jpg | bin | 0 -> 2029 bytes |
-rw-r--r-- | actionmailer/test/fixtures/attachments/test.jpg | bin | 0 -> 2029 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/actionmailer/test/fixtures/attachments/foo.jpg b/actionmailer/test/fixtures/attachments/foo.jpg Binary files differnew file mode 100644 index 0000000000..b976fe5e00 --- /dev/null +++ b/actionmailer/test/fixtures/attachments/foo.jpg diff --git a/actionmailer/test/fixtures/attachments/test.jpg b/actionmailer/test/fixtures/attachments/test.jpg Binary files differnew file mode 100644 index 0000000000..b976fe5e00 --- /dev/null +++ b/actionmailer/test/fixtures/attachments/test.jpg |