summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-08-04Merge branch 'ikiwiki' into daJonas Smedegaard
Conflicts: templates.mdwn
2012-08-04Sync with ikiwiki 3.20120419.Jonas Smedegaard
2012-03-30Merge branch 'ikiwiki' into daJonas Smedegaard
Conflicts (resolved manually): shortcuts.mdwn templates.mdwn
2012-03-30Sync with ikiwiki 3.20120203.Jonas Smedegaard
2012-02-16Merge branch 'ikiwiki' into daJonas Smedegaard
Conflicts (resolved manually): ikiwiki/pagespec/sorting.mdwn shortcuts.mdwn
2012-02-16Sync with ikiwiki 3.20120202.Jonas Smedegaard
2011-10-06Merge branch 'ikiwiki' into daJonas Smedegaard
Conflicts (resolved manually): shortcuts.mdwn
2011-10-06Sync with ikiwiki 3.20110905.Jonas Smedegaard
2011-06-15Update translation.Jonas Smedegaard
2011-06-15Merge branch 'ikiwiki' into daJonas Smedegaard
2011-06-15Sync with ikiwiki 3.20110608.Jonas Smedegaard
2011-02-10Translate to danish.Jonas Smedegaard
2011-02-10topgit: initJonas Smedegaard
2010-10-14Sync with ikiwiki 3.20100926.Jonas Smedegaard