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
friendica 7a259d4acb ensure comment counts update after refactor of collapsed comments 2011-11-23 14:03:53 -08:00
friendica 53590d2166 rework show/hide comments 2011-11-22 16:00:05 -08:00