diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-22 12:50:02 +0100 |
| commit | cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2 (patch) | |
| tree | b88556dbafbabac5753bdec9e51fcb24ec4ca3b8 /view/auto_request.tpl | |
| parent | 29900febb341cfbec6e4445d4ea1c2dc782a521a (diff) | |
| parent | 808180ce5f9471aa36faf8861fb84d04b412f412 (diff) | |
| download | volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.gz volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.tar.bz2 volse-hubzilla-cea7ca1df4fd8065c38a4f43a0f13ba89e8b94e2.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
boot.php
database.sql
include/template_processor.php
update.php
Diffstat (limited to 'view/auto_request.tpl')
| -rwxr-xr-x | view/auto_request.tpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 204fcf247..2958397c9 100755 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -7,8 +7,15 @@ $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> </p> +<p> +$invite_desc +</p> +<p> +$desc +</p> <form action="dfrn_request/$nickname" method="post" /> |