summaryrefslogtreecommitdiff
path: root/editconflict.tmpl
AgeCommit message (Collapse)Author
2008-08-01Merge branch 'master' into master-daJonas Smedegaard
Conflicts (merged manually): editpage.tmpl searchquery.tmpl Pages translated as part of the merge: editconflict.tmpl editcreationconflict.tmpl editfailedsave.tmpl editpagegone.tmpl renamesummary.tmpl
2008-08-01Sync with ikiwiki 2.55.Jonas Smedegaard