Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-08-31 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
2010-08-31 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup ikiwiki_nb.setup | |||
2010-08-31 | Merge branch 'wian' into allinone-da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
2010-08-31 | Merge branch '_scs' into allinone-da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
2010-08-31 | Merge branch '_clean' into allinone-da | Jonas Smedegaard | |
2010-08-31 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch 'master' into wian | Jonas Smedegaard | |
2010-08-31 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _scs | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
2010-08-31 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _clean | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _nb | Jonas Smedegaard | |
2010-08-31 | Fix generalize gitrepo in ikiwiki setup file. | Jonas Smedegaard | |
2010-08-31 | Fix use qw{} in add_plugins and disable_plugins. | Jonas Smedegaard | |
2010-08-31 | Fix generalize paths and URLs iki ikiwiki setup file. | Jonas Smedegaard | |
2010-08-31 | Merge branch 'allinone-nb' into allinone-multilang | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_nb.setup ikiwiki_nb_admin.setup | |||
2010-08-31 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki.setup | |||
2010-08-31 | Merge branch 'wian' into allinone-da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'wian' into allinone-nb | Jonas Smedegaard | |
2010-08-31 | Merge branch '_scs' into allinone-da | Jonas Smedegaard | |
2010-08-31 | Merge branch '_scs' into allinone-nb | Jonas Smedegaard | |
2010-08-31 | Merge branch '_clean' into allinone-da | Jonas Smedegaard | |
2010-08-31 | Merge branch '_clean' into allinone-nb | Jonas Smedegaard | |
2010-08-31 | Merge branch '_nb' into allinone-nb | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_nb.setup | |||
2010-08-31 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_nb.setup | |||
2010-08-31 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
Conflicts (resolved manually): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_da' into allinone-da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch '_nb' into nb | Jonas Smedegaard | |
2010-08-31 | Merge branch '_da' into da | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _multilang | Jonas Smedegaard | |
Conflicts (manually resolve): ikiwiki.setup | |||
2010-08-31 | Merge branch 'master' into _nb | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_nb.setup | |||
2010-08-31 | Merge branch 'master' into _da | Jonas Smedegaard | |
Conflicts (manually resolved): ikiwiki_da.setup | |||
2010-08-31 | Merge branch 'master' into wian | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _scs | Jonas Smedegaard | |
2010-08-31 | Merge branch 'master' into _clean | Jonas Smedegaard | |
2010-08-31 | Generalize paths and URLs iki ikiwiki setup file. | Jonas Smedegaard | |
2010-08-30 | Fix set locale nb_NO (not bogus no_NB). | Jonas Smedegaard | |
2010-08-30 | Fix enable prefix_directives. | Jonas Smedegaard | |
2010-08-30 | Merge branch '_multilang' into allinone-multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch 'nb' into _multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch 'da' into _multilang | Jonas Smedegaard | |
2010-08-30 | Fix enable prefix_directives. | Jonas Smedegaard | |
2010-08-30 | Fix enable prefix_directives. | Jonas Smedegaard | |
2010-08-30 | Merge branch 'allinone-nb' into allinone-multilang | Jonas Smedegaard | |
2010-08-30 | Merge branch 'allinone-da' into allinone-multilang | Jonas Smedegaard | |