Commit Graph

4 Commits

Author SHA1 Message Date
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -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
Chris Case 11dd0c8571 html email updates 2011-05-21 19:23:56 -07:00