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 | ||||
* | quattro post preview, style contacts pages, style for "shiny" class, fix ↵ | Fabio Comuni | 2012-02-23 | 1 | -0/+25 |
contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts |