diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:33:11 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:33:11 +0200 |
| commit | 63076aa9fc75411320f7fd7b3c082ecc55ea48c8 (patch) | |
| tree | 8bf9568e5380f84f76ae370c57277ff64b280f0f | |
| parent | eaf929ccf7ff1f4d0175dc607754d07c1b918485 (diff) | |
| parent | 7a19f30c3cfb3ea4b00947eeffabc261ceac064c (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb.setup
ikiwiki_nb_admin.setup
| -rw-r--r-- | ikiwiki_nb.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index 2acc018..578b975 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -36,7 +36,7 @@ use IkiWiki::Setup::Standard { templatedir => $ENV{'HOME'} . '/private_webdata/samplewiki/templates_nonedit_l10n/nb', # base wiki source location underlaydirs => [ - $ENV{'HOME'} . "/private_webdata/samplewiki/content_l10n/nb", + $ENV{'HOME'} . '/private_webdata/samplewiki/content_l10n/nb', #$ENV{'HOME'} . '/private_webdata/samplewiki/smiley_l10n/nb', $ENV{'HOME'} . '/private_webdata/samplewiki/basewiki_nonedit_l10n/nb', ], |