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
|
338ba48554
|
more templates
|
2011-04-07 18:00:35 -07:00 |
|
Friendika
|
efd8ab6c72
|
more i18n reorg
|
2010-11-16 01:14:04 -08:00 |
|
Mike Macgirvin
|
7a21a000a2
|
lots of little stuff
|
2010-07-11 02:52:47 -07:00 |
|