Commit Graph

4 Commits

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 1aa1cd2cf5 soften the content-types 2011-10-25 15:52:54 -07:00
Friendika 61b730d567 cleanup content type icons 2011-05-25 20:01:53 -07:00