summaryrefslogtreecommitdiff
path: root/ikiwiki/pagespec
AgeCommit message (Collapse)Author
2008-08-02Merge branch 'master' into master-daJonas Smedegaard
Conflicts (manually solved): ikiwiki/blog.mdwn recentchanges.mdwn templates.mdwn Also translated the following: ikiwiki/pagespec/attachment.mdwn
2008-08-01Sync with ikiwiki 2.55.Jonas Smedegaard