Commit graph

9 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
Thomas 2772bb7f58 doc/Making-Friends.md 2012-03-06 19:04:42 +00: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 6d507a840a some doc updates 2011-11-08 14:12:01 -08:00
Friendika 6eb6b8f969 updated documentation 2011-09-05 19:19:58 -07:00
Friendika 741a262f1b updated docs to reflect email contacts 2011-04-18 01:48:29 -07:00
Friendika 158b65894a initial checkin mailbox reading functions - lots more to do 2011-04-15 19:16:37 -07:00
Friendika 44c47f118c "profile locator/address" is now called "Identity Address" to reduce confusion 2011-04-14 20:37:42 -07:00
Friendika 767f165965 local documentation library 2011-04-13 07:07:21 -07:00