3 Commits

Author	SHA1	Message	Date
Stefan Parviainen	fe80dbb3a7	Access list of smilies over JSON	2014-12-20 17:33:35 +01:00
Alexander Kampmann	355c42cb30	Merge branch 'master' of https://github.com/friendica/friendica ... Conflicts: include/config.php update.php	2012-04-05 13:39:15 +02:00
friendica	b1d31aca51	quick comments	2012-02-15 18:13:41 -08:00