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 |
|
Abinoam P. Marques Jr
|
2219c1b581
|
friendica.svg - Friendika -> Friendica
|
2012-02-20 19:38:42 -03: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 |
|