diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 15:50:08 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-13 15:50:08 +0200 |
| commit | 4696dbb0119b44691292713a9039ed2a2c27f6a8 (patch) | |
| tree | 23021cd99e172eb2e4e9e8eace348f5eb1420dfe | |
| parent | 9f932a5d3778ee712a21795376f87e43250fabf8 (diff) | |
| parent | 1e79fb9bbee7c035892759ca130ec6f37157fe3d (diff) | |
Merge branch '_nb' into allinone-nb
Conflicts (resolve manually):
ikiwiki_nb.setup
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 4b3e5b4..12e2db6 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.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/nb', + 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/nb", - $ENV{'HOME'} . "/private_webdata/samplewiki/basewiki_nonedit_l10n/nb", ], # Some plugins (smiley in particular) need non-localized master underlay underlaydir => $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit', |