Commit Graph

54 Commits

Author SHA1 Message Date
friendica 9ecd128e5e "show more" friends in common 2012-05-04 01:46:36 -07: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 8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Friendika 3d9a9614e2 common friends 2011-11-01 19:16:33 -07:00