Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 29 | -0/+0 |
| | | | | | | Conflicts: include/config.php update.php | ||||
* | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 1 | -0/+0 |
| | |||||
* | add themes diabook-red & diabook-aerith | tommy tomson | 2012-03-30 | 60 | -0/+0 |