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	1fcbc7aa5a	add links to /profiles, add some icons to diabook/icons, fixes in css	2012-03-08 14:49:07 +01:00