aboutsummaryrefslogtreecommitdiffstats
path: root/view/profile_vcard.tpl
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2011-08-17 17:35:37 +0200
committerfabrixxm <fabrix.xm@gmail.com>2011-08-17 17:35:37 +0200
commitbdf42473a0341f291cd256323d122aa80bb0cb0b (patch)
tree922a5ba24a34d7ea89673019e82f68436edb7091 /view/profile_vcard.tpl
parent6c423feed2d8bc5bd36d2a1cbac073915e523749 (diff)
parentdb03b1ab173d61b1ee75271dac1e48f3475ad42c (diff)
downloadvolse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.gz
volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.tar.bz2
volse-hubzilla-bdf42473a0341f291cd256323d122aa80bb0cb0b.zip
Merge remote-tracking branch 'friendika/master' into newui
Diffstat (limited to 'view/profile_vcard.tpl')
-rw-r--r--view/profile_vcard.tpl2
1 files changed, 2 insertions, 0 deletions
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 3cd96eabf..86655951d 100644
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -24,3 +24,5 @@ $marital
$homepage
+$diaspora
+