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): 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
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
2010-08-30Merge branch '_da' 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 _nbJonas Smedegaard
2010-08-30Merge branch 'master' into _daJonas Smedegaard
2010-08-30Merge branch 'master' into wianJonas Smedegaard
2010-08-30Merge branch 'master' into _multilangJonas Smedegaard
2010-08-30Merge branch 'master' into _scsJonas Smedegaard
2010-08-30Merge branch 'master' into _cleanJonas Smedegaard
2010-08-30Avoid setting CGI script suid: upsets apache2-suexec.Jonas Smedegaard
2010-08-27Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): .gitmodules ikiwiki_nb.setup
2010-08-27Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): .gitmodules ikiwiki_da.setup
2010-08-27Merge branch 'wian' into allinone-nbJonas Smedegaard
2010-08-27Merge branch 'wian' into allinone-daJonas Smedegaard
2010-08-27Sync plugins farbar and topbar with Ikiwiki 3.20100722 sidebar.Jonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-21Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (suppress changes): templates templates_nonedit
2010-07-21Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (suppress changes): templates templates_nonedit
2010-07-21Sync submodules templates* with HEAD of allinone*.Jonas Smedegaard
2010-07-21Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): templates
2010-07-21Sync submodules templates(_nonedit) with HEAD of allinone(-nonedit)-da.Jonas Smedegaard
2010-07-21Merge branch 'wian' into allinone-daJonas Smedegaard
Conflicts (suppress changes): templates
2010-07-21Sync submodules templates(_nonedit) with HEAD of allinone(-nonedit)-da.Jonas Smedegaard
2010-07-20Sync submodule templates with HEAD of wian.Jonas Smedegaard
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2010-07-19Sync submodule directives with HEAD of master.Jonas Smedegaard
2010-07-19Sync submodule directives with HEAD of master.Jonas Smedegaard
2010-07-19Sync submodule directives with HEAD of master.Jonas Smedegaard
2010-07-19Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2010-07-19Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
Conflicts (suppress changes): basewiki_nonedit
2010-07-19Merge branch '_multilang' into allinone-multilangJonas Smedegaard
Conflicts (sync with submodule HEADs): templates
2010-07-19Merge branch 'wian' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki
2010-07-19Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2010-07-19Merge branch '_scs' into allinone-nbJonas Smedegaard
Conflicts (suppress changes): basewiki templates
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-15 12:53:54 +0000