Commit Graph

3 Commits (67f699403a6df541c1eb9dc26008232858e8084a)

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
Mike Macgirvin 177a6d7f79 provide visual indicator when pausing ajax updates 2010-09-20 01:13:19 -07:00