summaryrefslogtreecommitdiff
path: root/atompage.tmpl
AgeCommit message (Collapse)Author
2008-08-02Merge branch 'master' into master-daJonas Smedegaard
Conflicts (manually resolved): atomitem.tmpl atompage.tmpl estseek.conf Also dropped the following (changed earlier than 2.56 but missed): estseek.conf estseek.help
2008-08-02Sync with ikiwiki 2.56.Jonas Smedegaard
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
2008-01-20Sync with upstream commit 405e8a703126cc5de426063dedbd2394b747782a (Wed Jan ↵Jonas Smedegaard
9, release 2.20).
2008-01-20Sync with upstream commit 405e8a703126cc5de426063dedbd2394b747782a (Wed Jan ↵Jonas Smedegaard
9, release 2.20).
2007-10-16Grab upstream pages from version 2.9.Jonas Smedegaard