summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
AgeCommit message (Collapse)Author
2008-08-01Sync with ikiwiki 2.55.Jonas Smedegaard