Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | add remove_user hook (it looks like dreamhost changed all my file ↵ | friendica | 2012-01-18 | 1 | -0/+0 |
| | | | | permissions, this will make a nasty commit) | ||||
* | More french templates. | olivierm | 2011-02-23 | 1 | -11/+12 |
| | |||||
* | Started the french translation (up to the "TODO" comment in view/fr/strings.php) | olivierm | 2011-01-21 | 1 | -0/+22 |