aboutsummaryrefslogtreecommitdiff
path: root/data/templates/testdummy/top.inc.php
AgeCommit message (Collapse)Author
2011-06-04Merge branch 'master' into privatekey2Mark Pemberton
Conflicts: data/templates/default/bookmarks.tpl.php
2011-05-25implement request #1989987: theme support. merge themes branch with --squashChristian Weiske