aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/quattro/mail_conv.tpl
diff options
context:
space:
mode:
authorSimon L'nu <simon.lnu@gmail.com>2012-04-06 03:54:09 -0400
committerSimon L'nu <simon.lnu@gmail.com>2012-04-06 03:54:09 -0400
commit43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (patch)
tree2f9d83d87682b16ac6ac949382ab566fdca48076 /view/theme/quattro/mail_conv.tpl
parentb361bcea83140c28b5a5677905405de0ac102791 (diff)
parentafd2bf031eff688ae53e51f9199d025ca1935abe (diff)
downloadvolse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.gz
volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.tar.bz2
volse-hubzilla-43d5876e8b35d53a0bef5248c5d63e5bc209dbbf.zip
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: update to the German strings add network_tabs hook pass autoname(0) test rev update added index to config and pconfig table changed config.php to use REPLACE instead of INSERT, this removes one db hit. * master:
Diffstat (limited to 'view/theme/quattro/mail_conv.tpl')
-rw-r--r--[-rwxr-xr-x]view/theme/quattro/mail_conv.tpl0
1 files changed, 0 insertions, 0 deletions
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
index 989f17878..989f17878 100755..100644
--- a/view/theme/quattro/mail_conv.tpl
+++ b/view/theme/quattro/mail_conv.tpl