diff options
author | Michael Vogel <icarus@dabo.de> | 2012-03-15 21:11:58 +0100 |
---|---|---|
committer | Michael Vogel <icarus@dabo.de> | 2012-03-15 21:11:58 +0100 |
commit | 9243c9fc141237453f05d215058d4b975d010437 (patch) | |
tree | 0c63dd28deeb2157ee2683e787f00a4e8b5eaa7b /view/dfrn_request.tpl | |
parent | 6e7a190e9197bcf4d00accc5d85ccca4a080bec8 (diff) | |
parent | ab89aa90caced4f60fc0ae944c7190e156a872e2 (diff) | |
download | volse-hubzilla-9243c9fc141237453f05d215058d4b975d010437.tar.gz volse-hubzilla-9243c9fc141237453f05d215058d4b975d010437.tar.bz2 volse-hubzilla-9243c9fc141237453f05d215058d4b975d010437.zip |
Merge commit 'upstream/master'
Diffstat (limited to 'view/dfrn_request.tpl')
-rwxr-xr-x | view/dfrn_request.tpl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl index cd98a4daa..d8aa8b181 100755 --- a/view/dfrn_request.tpl +++ b/view/dfrn_request.tpl @@ -7,7 +7,11 @@ $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> </ul> +$invite_desc +</p> +<p> $desc </p> |