aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-red/mail_conv.tpl
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-04-15 14:11:11 +0200
committerzottel <github@zottel.net>2012-04-15 14:11:11 +0200
commita2c4ce74871dbe9e640cdeafc1574bda5b7fe144 (patch)
treefce1c1b2d497adae72d77e09c6bf005c8900256b /view/theme/diabook-red/mail_conv.tpl
parent0bad8de0562a50fa93b0af5fd4cf8d7123a11b46 (diff)
parentf299749758112361ee6384cd75d11b2c3a57352a (diff)
downloadvolse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.gz
volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.tar.bz2
volse-hubzilla-a2c4ce74871dbe9e640cdeafc1574bda5b7fe144.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/diabook-red/mail_conv.tpl')
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-red/mail_conv.tpl0
1 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/diabook-red/mail_conv.tpl b/view/theme/diabook-red/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/diabook-red/mail_conv.tpl
+++ b/view/theme/diabook-red/mail_conv.tpl