aboutsummaryrefslogtreecommitdiffstats
path: root/mod/smilies.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/friendica/friendicaAlexander Kampmann2012-04-051-0/+0
| | | | | | Conflicts: include/config.php update.php
* quick commentsfriendica2012-02-151-0/+3