diff options
author | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
commit | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch) | |
tree | c677adb7c0e8140bdb1e115a95d1aa23fdf734ed /view/auto_request.tpl | |
parent | 311e35731c52102cbce3befc6343f179080ad38c (diff) | |
parent | 8cacff69858c2ad097bafb80c93405e79c311edf (diff) | |
download | volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2 volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip |
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Diffstat (limited to 'view/auto_request.tpl')
-rwxr-xr-x | view/auto_request.tpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/view/auto_request.tpl b/view/auto_request.tpl index 377da25c5..204fcf247 100755 --- a/view/auto_request.tpl +++ b/view/auto_request.tpl @@ -4,7 +4,7 @@ <p id="dfrn-request-intro"> $page_desc<br /> <ul id="dfrn-request-networks"> -<li><a href="http://friendika.com" title="$friendika">$friendika</a></li> +<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> </ul> |