Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into privatekey2 | Mark Pemberton | 2011-06-04 | 3 | -8/+13 |
| | | | | | | Conflicts: data/templates/default/bookmarks.tpl.php | ||||
* | implement request #1989987: theme support. merge themes ↵ | Christian Weiske | 2011-05-25 | 50 | -0/+2973 |
branch with --squash |