diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 15:42:37 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 15:42:37 +0200 |
| commit | efd40a45e4f91d9526eb4ae60fe6d5a1467139ba (patch) | |
| tree | f7c6ed8a11b951c90ad65c62b9cb21ba7b3150cd | |
| parent | 5b27f348637e7dccba395f8dddb40aa6ce003ebf (diff) | |
| parent | e2167037f69cd6339ee27901ab13073c08443027 (diff) | |
Merge branch '_da' into allinone-da
Conflicts (resolved manually):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index ae7b84a..9f63af0 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,12 +33,10 @@ use IkiWiki::Setup::Standard { # plugins to disable disable_plugins => [], # location of template files - templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/da', + templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit', # base wiki source location underlaydirs => [ $ENV{'HOME'} . '/private_webdata/samplewiki/content', - #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_l10n/da', - $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_l10n/da', ], # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit', |