Commit Graph

3 Commits (53f0aee82d61b7d61fb2271eb7f41cacc2eaf8f3)

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
Fabio Comuni abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00