summaryrefslogtreecommitdiffstatshomepage
path: root/data/templates/default/editprofile.tpl.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into privatekey2Gravatar Mark Pemberton2011-06-041-0/+8
| | | | | | Conflicts: data/templates/default/bookmarks.tpl.php
* implement request #1989987: theme support. merge themes ↵Gravatar Christian Weiske2011-05-251-0/+73
branch with --squash