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
|
cca524495c
|
community discovery cont., cleanup of DB debugging
|
2012-03-18 22:12:36 -07: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
|
e15e18e0d1
|
hopefully fix statusnet bug by altering our feed format slightly
|
2011-08-12 21:01:51 -07:00 |
|