diff options
author | Friendika <info@friendika.com> | 2011-10-05 15:37:17 -0700 |
---|---|---|
committer | Friendika <info@friendika.com> | 2011-10-05 15:37:17 -0700 |
commit | 7df6cb850efd323e03ea329957273f7d1e3c0323 (patch) | |
tree | 23874f59e66907af1f7e8956f49dca92776b0aa1 /include | |
parent | b1e5dfad3cb3881bb2e5655ede1b64adaff32dcc (diff) | |
parent | 0b4e3a06ede41b6e84a4707316552365d5d5051c (diff) | |
download | volse-hubzilla-7df6cb850efd323e03ea329957273f7d1e3c0323.tar.gz volse-hubzilla-7df6cb850efd323e03ea329957273f7d1e3c0323.tar.bz2 volse-hubzilla-7df6cb850efd323e03ea329957273f7d1e3c0323.zip |
Merge branch 'pull'
Diffstat (limited to 'include')
-rw-r--r-- | include/text.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php index bc711e6da..fd413b7d6 100644 --- a/include/text.php +++ b/include/text.php @@ -688,7 +688,7 @@ function smilies($s) { '<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-|" />', '<img src="' . $a->get_baseurl() . '/images/smiley-surprised.gif" alt="8-O" />', '<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>', - '<a href="http://joindiaspora.com">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>', + '<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>', ), $s); |