Commit Graph

3 Commits (f16a1199408d167bbc7c52dc408ef02b36808317)

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 57beadc86b add diaspora signed_retraction template 2011-11-05 14:25:06 -07:00