Commit Graph

6 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 94c7289a3f updates to plugin docs 2012-02-13 19:06:15 -08: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 02a1fdacd7 strip duplicate code blocks bb2d* 2011-11-08 15:38:06 -08:00
Friendika 6d507a840a some doc updates 2011-11-08 14:12:01 -08:00
Friendika 767f165965 local documentation library 2011-04-13 07:07:21 -07:00