2 commits

Author	SHA1	Message	Date
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	a1861d1128	tagging missing from wallwall and a couple of themes, star missing from dispy	2012-02-26 16:29:06 -08:00