summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki.setup
2010-08-30Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-08-30Merge branch 'wian' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-08-30Merge branch '_scs' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-08-30Merge branch '_clean' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
2010-08-30Merge branch '_da' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-30Merge branch '_nb' into nbJonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup
2010-08-30Merge branch 'master' into wianJonas Smedegaard
2010-08-30Merge branch 'master' into _scsJonas Smedegaard
2010-08-30Merge branch 'master' into _cleanJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Merge branch 'master' into _multilangJonas Smedegaard
2010-08-30Use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-08-30Merge branch 'wian' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_nb' into nbJonas Smedegaard
2010-08-30Merge branch '_da' into daJonas Smedegaard
2010-08-30Merge branch 'master' into _multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch '_scs' into allinone-nbJonas Smedegaard
2010-08-30Merge branch '_scs' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch '_clean' into allinone-nbJonas Smedegaard
2010-08-30Merge branch '_clean' into allinone-daJonas Smedegaard
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-08-30Merge branch '_da' into allinone-daJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolve): ikiwiki_da.setup
2010-08-30Merge branch 'master' into wianJonas Smedegaard
2010-08-30Merge branch 'master' into _scsJonas Smedegaard
2010-08-30Merge branch 'master' into _cleanJonas Smedegaard
2010-08-30Always enable VCS (not only for admin setup.Jonas Smedegaard
2010-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): Makefile smiley
2010-08-30Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (manually resolve): Makefile basewiki ikiwiki_nb.setup templates
2010-08-30Merge branch 'da' into _multilangJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard