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 0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika 5b24050875 split off facebook and other cron hooks from poller 2011-08-14 22:59:34 -07:00