Commit graph

5 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
Friendika
6d507a840a some doc updates 2011-11-08 14:12:01 -08:00
Abinoam P. Marques Jr.
e20ba2c271 Changing git url for Free-Friendika 2011-09-26 23:45:08 -03:00
Friendika
767f165965 local documentation library 2011-04-13 07:07:21 -07:00