Commit graph

7 commits

Author SHA1 Message Date
Michael Vogel 307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
Conflicts:
	include/ostatus.php
2015-12-22 11:25:37 +01:00
Michael Vogel bfc0857953 OStatus: Send even Friendica comments to OStatus 2015-12-07 21:52:42 +01:00
fabrixxm 0b83432bf3 better logger format, some comments 2014-04-27 15:18:43 +02:00
Michael Vogel 53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
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 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00