Commit Graph

7 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 6726d406f0 revup - change connector config link in doc 2011-11-15 12:01:21 -08:00
Friendika 6d507a840a some doc updates 2011-11-08 14:12:01 -08:00
Erkan Yilmaz 0401130246 typos + adapt 2011-09-02 08:15:36 +02:00
Friendika 43110db749 begin invites, fb setup changes 2011-07-17 16:08:47 -07:00
Friendika 990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00