summaryrefslogtreecommitdiff
path: root/editcreationconflict.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
='oid'>ba46132213560cf3335d53560d519c0ec0190da2 (diff)
master
Diffstat (limited to 'tags/18/a2/20180903100002.2765B1CCCAF@lxp5.free-owl.de/unread')