diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:47:41 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 15:47:41 +0200 |
| commit | 38dc6ad617b427d433fb0583272d76a92883d3ae (patch) | |
| tree | 2455c16af7fd433aa2001b33bacb101a4e481155 | |
| parent | 434cd6f0c3b31ac57f138b5e3333278c846ff383 (diff) | |
| parent | b4b490324165d7177199034316ef3bc76be362dd (diff) | |
Merge branch '_da' into allinone-da
Conflicts (manually resolved):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 2f207e9..274ad5b 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,7 +33,7 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/da', # base wiki source location underlaydirs => [ $ENV{'HOME'} . "/private_webdata/samplewiki/content", |