Commit Graph

3 Commits (c2176aad364f657094b6dc9a603a1e2d18a32ca9)

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 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 f04e2e7044 edit group links on network page 2011-04-12 18:22:58 -07:00