summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
AgeCommit message (Collapse)Author
2010-10-14Sync with ikiwiki 3.20100926.Jonas Smedegaard