summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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 '_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-03Fix always prepend basedir in ikiwiki config, and tidy our vars.Jonas Smedegaard
2010-09-01Merge branch '_nb' into nbJonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _nbJonas Smedegaard
2010-09-01Merge branch 'da' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Fix have install target depend on init.Jonas Smedegaard
2010-09-01Merge branch '_nb' into nbJonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch 'master' into _nbJonas Smedegaard
2010-09-01Merge branch 'nb' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Merge branch 'da' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Drop TODO (locale files are now in same dir as smiley plugin).Jonas Smedegaard
2010-09-01Merge branch '_nb' into nbJonas Smedegaard
2010-09-01Merge branch '_da' into daJonas Smedegaard
2010-09-01Merge branch 'master' into _multilangJonas Smedegaard
2010-09-01Merge branch 'master' into _nbJonas Smedegaard
2010-09-01Merge branch 'master' into _daJonas Smedegaard
2010-09-01Create dummy_MODULES in init target.Jonas Smedegaard
2010-08-31Fix always enable VCS (not only for admin setup.Jonas Smedegaard
2010-08-31Merge branch 'nb' into _multilangJonas Smedegaard
2010-08-31Merge branch 'da' into _multilangJonas Smedegaard
2010-08-31Merge branch '_nb' into nbJonas Smedegaard
2010-08-31Merge branch '_da' into daJonas Smedegaard
2010-08-31Merge branch 'master' into _nbJonas Smedegaard
2010-08-31Merge branch 'master' into _daJonas Smedegaard
2010-08-31Merge branch 'master' into _multilangJonas Smedegaard
2010-08-31Fix generalize gitrepo in ikiwiki setup file.Jonas Smedegaard
2010-08-31Fix use qw{} in add_plugins and disable_plugins.Jonas Smedegaard
2010-08-31Fix generalize paths and URLs iki ikiwiki setup file.Jonas Smedegaard
2010-08-31Merge branch 'nb' into _multilangJonas Smedegaard
Conflicts (resolved manually): ikiwiki_nb.setup
2010-08-31Merge branch 'da' into _multilangJonas Smedegaard
Conflicts (resolved manually): ikiwiki_da.setup
2010-08-31Merge branch '_nb' into nbJonas Smedegaard
2010-08-31Merge branch '_da' into daJonas Smedegaard
2010-08-31Merge branch 'master' into _multilangJonas Smedegaard
Conflicts (manually resolve): ikiwiki.setup
2010-08-31Merge branch 'master' into _nbJonas Smedegaard
Conflicts (manually resolved): ikiwiki_nb.setup
2010-08-31Merge branch 'master' into _daJonas Smedegaard
Conflicts (manually resolved): ikiwiki_da.setup