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 |
|
Mike Macgirvin
|
b399b20dee
|
mail, i18n, etc.
|
2010-07-30 06:09:20 -07:00 |
|
Mike Macgirvin
|
7ef0207cea
|
additions
|
2010-07-21 21:24:22 -07:00 |
|