diff options
| author | friendica <info@friendica.com> | 2013-05-28 22:03:53 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-05-28 22:03:53 -0700 |
| commit | 9e5f54af60de83b75d4d70e2f4685b86a59c5d94 (patch) | |
| tree | 382877e4d89387a040987fa775f7bf292cc66b4e | |
| parent | ea11ff57ce3770bd56cba0f67ec026c74d8e5f73 (diff) | |
| parent | d76fdde7cb319c21e0c088896a04d5b420816521 (diff) | |
| download | volse-hubzilla-9e5f54af60de83b75d4d70e2f4685b86a59c5d94.tar.gz volse-hubzilla-9e5f54af60de83b75d4d70e2f4685b86a59c5d94.tar.bz2 volse-hubzilla-9e5f54af60de83b75d4d70e2f4685b86a59c5d94.zip | |
Merge https://github.com/friendica/red into zpull
| -rwxr-xr-x | include/text.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/text.php b/include/text.php index f10541144..9f32959b2 100755 --- a/include/text.php +++ b/include/text.php @@ -853,6 +853,7 @@ function smilies($s, $sample = false) { ':facepalm', ':like', ':dislike', + 'red#', '~friendika', '~friendica' |