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 |
|
olivierm
|
a6870ceb41
|
More french templates.
|
2011-02-23 20:41:23 +01:00 |
|
olivierm
|
e1c0b5c7c5
|
Started the french translation (up to the "TODO" comment in view/fr/strings.php)
|
2011-01-21 10:39:15 +01:00 |
|