summaryrefslogtreecommitdiff
path: root/ikiwiki_nb.setup
AgeCommit message (Collapse)Author
2010-10-04Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-10-04Merge branch 'master' into _nbJonas Smedegaard
2010-09-03Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-09-03Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-31Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-08-31Merge branch 'master' into _nbJonas Smedegaard
2010-08-31Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (resolved manually): ikiwiki_nb.setup
2010-08-31Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-30Merge branch '_nb' into allinone-nbJonas Smedegaard
2010-08-30Merge branch 'master' into _nbJonas Smedegaard
2010-07-23Drop nonedit branches: Disable plugin editpage instead.Jonas Smedegaard
2010-07-13Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (resolve manually): ikiwiki_nb.setup
2010-07-11Use main basewiki and templates dir (not ...l10n subdir) in ikiwiki_nb.config.Jonas Smedegaard
2008-11-17Fix branding_logo_text -> branding_logo_tagline.Jonas Smedegaard
2008-11-13Merge branch 'nonedit' into allinone-nbJonas Smedegaard
2008-11-01Add varioki sample strings to non-admin config.Jonas Smedegaard
2008-10-25Use full libdir path for non-admin config.Jonas Smedegaard
2008-10-25Fix merge noise.Jonas Smedegaard
2008-10-25Merge branch 'master' into _nbJonas Smedegaard
2008-10-23Merge branch '_nb' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-10-23Merge branch 'master' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb_admin.setup
2008-10-23Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2008-08-15Merge branch '_nb' into allinone-nbJonas Smedegaard
2008-08-15Fix use locale-specific Git hook.Jonas Smedegaard
2008-08-15Merge branch '_clean' into allinone-nbJonas Smedegaard
2008-08-15Merge branch 'nonedit' into allinone-nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup Also, use nb setup files in Makefile.
2008-08-14Use and adapt new ikiwiki_nb.setup. Drop ikiwiki.setup.Jonas Smedegaard
2008-08-14Fork ikiwiki.setup as ikiwiki_nb.setup.Jonas Smedegaard
generated by cgit v1.2.3 (git 2.46.0) at 2024-11-15 02:26:44 +0000