Merge https://github.com/friendica/red into zpull

2013-05-28 22:03:53 -07:00
parent ea11ff57ce d76fdde7cb
commit 9e5f54af60
1 changed files with 1 additions and 0 deletions
@@ -853,6 +853,7 @@ function smilies($s, $sample = false) {
 		':facepalm',
 		':like',
 		':dislike',
+		'red#',
 		'~friendika', 
 		'~friendica'