diff options
| author | Friendika <info@friendika.com> | 2011-02-17 14:05:51 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2011-02-17 14:05:51 -0800 |
| commit | 0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05 (patch) | |
| tree | 26a8df206e8fbd8f91fd33afb8b62a5c67f72386 /view/fr | |
| parent | 45bd7d5e290957a6af38cd44a32033938b8ccdb0 (diff) | |
| parent | 9e654f7e5777458941e93b4bfa6de2a11d4374f9 (diff) | |
| download | volse-hubzilla-0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05.tar.gz volse-hubzilla-0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05.tar.bz2 volse-hubzilla-0bf8e418a8b8c57607ed8a52cff6b3ac53d38d05.zip | |
Merge branch 'chriscase-master'
Conflicts:
mod/dfrn_notify.php
Diffstat (limited to 'view/fr')
| -rw-r--r-- | view/fr/mail_received_eml.tpl | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/view/fr/mail_received_eml.tpl b/view/fr/mail_received_eml.tpl deleted file mode 100644 index 6ddd586fc..000000000 --- a/view/fr/mail_received_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ ---$mimeboundary -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: base64 - -$textbody - ---$mimeboundary -Content-Type: text/html; charset=UTF-8 -Content-Transfer-Encoding: base64 - -$htmlbody - ---$mimeboundary--
\ No newline at end of file |