summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-30Merge branch 'master' into noneditJonas Smedegaard
2008-08-30Merge branch 'master' into _scsJonas Smedegaard
2008-08-30Merge branch 'master' into _cleanJonas Smedegaard
2008-08-30Sync POT and danish PO with ikiwiki 2.62.1.Jonas Smedegaard
2008-08-30Adjust header when creating/updating POT files.Jonas Smedegaard
2008-08-30Setup _dummy_xx (not _xx_dummy) in Makefile.Jonas Smedegaard
2008-08-30Set (commented out) locale-specific html extension in admin configs.Jonas Smedegaard
2008-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-30Set (commented out) locale-specific html extension in configs.Jonas Smedegaard
2008-08-30Use localized branch for git in localized admin configs.Jonas Smedegaard
2008-08-30Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb_admin.setup
2008-08-30Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2008-08-30Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-30Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb_admin.setup
2008-08-30Merge branch 'nonedit' into allinone-daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da_admin.setup
2008-08-30Fix use admin.example... (not admin.wiki.example...).Jonas Smedegaard
2008-08-30Use localized branch for git in localized configs.Jonas Smedegaard
2008-08-20Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2008-08-20Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-08-20Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2008-08-20Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-08-20Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-20Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-20Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-20Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-20Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-20Merge branch '_nb' into nbJonas Smedegaard
2008-08-20Merge branch '_da' into daJonas Smedegaard
2008-08-20Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-20Merge branch '_da' into allinone-daJonas Smedegaard
2008-08-20Merge branch 'master' into _nbJonas Smedegaard
2008-08-20Merge branch 'master' into _daJonas Smedegaard
2008-08-20Merge branch 'master' into _multilangJonas Smedegaard
2008-08-20Merge branch 'master' into allinone-nbJonas Smedegaard
2008-08-20Merge branch 'master' into allinone-daJonas Smedegaard
2008-08-20Merge branch 'master' into _scsJonas Smedegaard
2008-08-20Merge branch 'master' into _cleanJonas Smedegaard
2008-08-20Merge branch 'master' into noneditJonas Smedegaard
2008-08-20Fix branch checkout in git.mk.Jonas Smedegaard
2008-08-15Merge branch 'allinone-nb' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch 'allinone-da' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_multilang' into allinone-multilangJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_scs' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-daJonas Smedegaard
2008-08-15Merge branch '_nb' into nbJonas Smedegaard
2008-08-15Merge branch '_nb' into allinone-nbJonas Smedegaard