Commit graph

12 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
7e10401ec0 doc/Account-Basics.md 2012-03-06 19:15:40 +00:00
Thomas
bab865b14e doc/Account-Basics.md 2012-03-06 19:15:24 +00:00
Thomas
aed5a8e2e5 a 2012-03-06 19:11:24 +00:00
Thomas
1bf9f3823c doc/Account-Basics.md 2012-03-06 18:48:39 +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
980d3864cb document newmember link so you can find it later. 2011-06-03 06:49:57 -07:00
Friendika
990d5e82a0 doc updates - connecting to services 2011-05-18 17:29:12 -07:00
Friendika
34f3cb68a6 document the end-user steps needed to use optional Facebook connector 2011-05-05 20:35:46 -07:00
Friendika
17a7dae67d doco 2011-04-13 16:58:21 -07:00