summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-10-01Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-10-01Merge branch 'master' into _multilangJonas Smedegaard
2010-10-01Fix make space after hash optional in plugin h1title.Jonas Smedegaard
2010-09-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2010-09-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-09-30Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-30Merge branch 'da' into _multilangJonas Smedegaard
2010-09-30Fix admin config always prepend basedir, and tidy our vars.Jonas Smedegaard
2010-09-30Fix admin config always prepend basedir, and tidy our vars.Jonas Smedegaard
2010-09-16Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-09-16Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-09-16Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-09-16Merge branch 'wian' into allinone-daJonas Smedegaard
2010-09-16Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-09-16Merge branch '_scs' into allinone-daJonas Smedegaard
2010-09-16Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-09-16Merge branch '_clean' into allinone-daJonas Smedegaard
2010-09-16Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-09-16Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-09-16Merge branch '_da' into allinone-daJonas Smedegaard
2010-09-16Merge branch '_nb' into nbJonas Smedegaard
2010-09-16Merge branch '_da' into daJonas Smedegaard
2010-09-16Merge branch 'master' into _multilangJonas Smedegaard
2010-09-16Merge branch 'master' into _nbJonas Smedegaard
2010-09-16Merge branch 'master' into _daJonas Smedegaard
2010-09-16Merge branch 'master' into wianJonas Smedegaard
2010-09-16Merge branch 'master' into _scsJonas Smedegaard
2010-09-16Merge branch 'master' into _cleanJonas Smedegaard
2010-09-16Add plugin h1title.Jonas Smedegaard
2010-09-03Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup ikiwiki_nb_admin.setup
2010-09-03Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-09-03Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-09-03Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-09-03Merge branch 'wian' into allinone-daJonas Smedegaard
2010-09-03Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-09-03Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-09-03Merge branch '_scs' into allinone-daJonas Smedegaard
2010-09-03Merge branch '_clean' into allinone-daJonas Smedegaard
2010-09-03Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-09-03Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-09-03Merge branch 'da' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-09-03Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-09-03Merge branch '_nb' into nbJonas Smedegaard
2010-09-03Merge branch '_da' into daJonas Smedegaard
2010-09-03Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-03Merge branch 'da' into _multilangJonas Smedegaard
2010-09-03Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-09-03Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-09-03Merge branch 'master' into _daJonas Smedegaard
Conflicts (resolved manually): ikiwiki_da.setup
2010-09-03Merge branch 'master' into wianJonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-29 11:16:17 +0000