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
Michael Johnston	581b54c974	allow users to set categories on their posts	2012-04-01 21:28:31 -04:00