Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge upstream | friendica | 2012-08-11 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | missing tooltip for "file as" | friendica | 2012-03-22 | 1 | -1/+1 |
| | |||||
* | add comix-plain | friendica | 2012-03-21 | 1 | -0/+85 |