aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-aerith/mail_conv.tpl
diff options
context:
space:
mode:
authorMichael <icarus@dabo.de>2012-05-16 08:10:28 +0200
committerMichael <icarus@dabo.de>2012-05-16 08:10:28 +0200
commit2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7 (patch)
tree8c569c61c06e50c943addc132286d44c2f8ec178 /view/theme/diabook-aerith/mail_conv.tpl
parent188829ed46be6d3c7a91380226e26e8292c327be (diff)
parenta3f08c44be78d4517e9f1619811def09b2ec7e7a (diff)
downloadvolse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.gz
volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.tar.bz2
volse-hubzilla-2b8c4df544f59d611ad1e8fc0dbc5fcd38bee8f7.zip
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'view/theme/diabook-aerith/mail_conv.tpl')
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-aerith/mail_conv.tpl0
1 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/diabook-aerith/mail_conv.tpl b/view/theme/diabook-aerith/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/diabook-aerith/mail_conv.tpl
+++ b/view/theme/diabook-aerith/mail_conv.tpl