Commit Graph

4 Commits (b88be578db9f221f9eb32da7431d6a71cffcebcc)

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 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika ec52010e16 helper functions for Diaspora cert mangling 2011-07-25 19:57:17 -07:00