| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2008-08-01 | Merge branch 'master' into master-da | Jonas 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-01 | Sync with ikiwiki 2.55. | Jonas Smedegaard | |
 |
index : ikiwiki/templates | |
| Ikiwiki - default templates localized | Jonas Smedegaard |
| summaryrefslogtreecommitdiff |
path: root/editconflict.tmpl