Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/friendica/friendica | Alexander Kampmann | 2012-04-05 | 1 | -7/+7 |
|\ | | | | | | | | | | | Conflicts: include/config.php update.php | ||||
| * | diabook-themes: css-fixes | tommy tomson | 2012-04-02 | 1 | -1/+1 |
| | | |||||
| * | bug-fixes in diabook-derivates | tommy tomson | 2012-03-31 | 1 | -6/+6 |
|/ | |||||
* | add theme diabook-blue, fix css | tommy tomson | 2012-03-08 | 1 | -0/+84 |