summaryrefslogtreecommitdiff
path: root/shortcuts.mdwn
AgeCommit message (Collapse)Author
2017-09-06Merge branch 'ikiwiki' into dadaJonas Smedegaard
2017-09-06Sync with ikiwiki 3.20170110.Jonas Smedegaard
2017-09-06Sync with ikiwiki 3.20161219.Jonas Smedegaard
2015-01-22Merge branch 'ikiwiki' into daJonas Smedegaard
Conflicts (resolved manually): shortcuts.mdwn templates.mdwn
2015-01-22Sync with ikiwiki 3.20141016.1.Jonas Smedegaard
2013-10-09Merge branch 'ikiwiki' into daJonas Smedegaard
Conflicts (manually resolved): ikiwiki/pagespec.mdwn shortcuts.mdwn
2013-10-09Sync with ikiwiki 3.20130904.1.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-02-10Translate to danish.Jonas Smedegaard
2010-10-14Sync with ikiwiki 3.20100926.Jonas Smedegaard