Commit Graph

4 Commits

Author SHA1 Message Date
Ben Roberts 22de27327c recreate fix for on correct branch 2016-06-18 08:16:09 -04: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 6a56ac2add language file security 2011-03-19 15:12:04 -07:00