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
tommy tomson	876aa0c752	small fix in diabook :: add local friendica to right_aside	2012-03-26 10:33:28 +02:00