diff options
author | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2012-04-24 02:18:51 +0100 |
commit | 8a80ea24d1d8039be6dc532c9db23c60e71eb467 (patch) | |
tree | 7f94f8d1e2336bbb7e69a327a003b6880f0610c0 /view/dfrn_request.tpl | |
parent | c4f4715a541ad89dfd348f14c4e25a83006e74e7 (diff) | |
parent | af7abcea2715824cbd6460a7323c8bb64bd5b829 (diff) | |
download | volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.gz volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.tar.bz2 volse-hubzilla-8a80ea24d1d8039be6dc532c9db23c60e71eb467.zip |
Merge remote-tracking branch 'upstream/master'
Merge upstream
Diffstat (limited to 'view/dfrn_request.tpl')
-rw-r--r--[-rwxr-xr-x] | view/dfrn_request.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index d8aa8b181..bd3bcbc42 100755..100644 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -7,7 +7,7 @@ $page_desc<br /> <li><a href="http://friendica.com" title="$friendica">$friendica</a></li> <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li> <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li> -<li>$emailnet</li> +{{ if $emailnet }}<li>$emailnet</li>{{ endif }} </ul> $invite_desc </p> |