aboutsummaryrefslogtreecommitdiffstats
path: root/include/text.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-20 18:07:16 -0800
committerfriendica <info@friendica.com>2012-02-20 18:07:16 -0800
commit6edd6d8ae1e3a6b64fa11ae6a4cc79965084b0d7 (patch)
tree4e3561b4f5e457d4420a232e0a233b6688d7745a /include/text.php
parent11871195be019bb05c7c41dbb4a980fffce41697 (diff)
parent1cfff8fdd11e0e67e2bdb7ae85b9caf8106a734b (diff)
downloadvolse-hubzilla-6edd6d8ae1e3a6b64fa11ae6a4cc79965084b0d7.tar.gz
volse-hubzilla-6edd6d8ae1e3a6b64fa11ae6a4cc79965084b0d7.tar.bz2
volse-hubzilla-6edd6d8ae1e3a6b64fa11ae6a4cc79965084b0d7.zip
Merge branch 'pull'
Diffstat (limited to 'include/text.php')
-rwxr-xr-xinclude/text.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text.php b/include/text.php
index b2c7862ce..5ef870fd7 100755
--- a/include/text.php
+++ b/include/text.php
@@ -759,7 +759,7 @@ function smilies($s, $sample = false) {
'<img src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
'<img src="' . $a->get_baseurl() . '/images/smiley-bangheaddesk.gif" alt=":headdesk" />',
'<a href="http://project.friendika.com">~friendika <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendika" /></a>',
- '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendika-16.png" alt="~friendica" /></a>',
+ '<a href="http://friendica.com">~friendica <img src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
'<a href="http://diasporafoundation.org">Diaspora<img src="' . $a->get_baseurl() . '/images/diaspora.png" alt="Diaspora*" /></a>',
);