diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:18:47 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:18:47 +0200 |
| commit | 7d4d5e70a554cb3bc37dcfcd6164f42668cd2ac6 (patch) | |
| tree | b0c01f81d3ac80017abb44ccdfa6be729c0360c5 | |
| parent | 9fb0039ae2c0e7d1b6ae44376ce304a55793b69a (diff) | |
| parent | 53a8818d9adc7508bce04d3dafa76f1f5c72d466 (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb_admin.setup
| -rw-r--r-- | ikiwiki_nb_admin.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb_admin.setup b/ikiwiki_nb_admin.setup index 22ffd6a..344ca13 100644 --- a/ikiwiki_nb_admin.setup +++ b/ikiwiki_nb_admin.setup @@ -15,7 +15,7 @@ use IkiWiki::Setup::Standard { destdir => $ENV{'HOME'} . "/public_websites/admin.example.org", url => "http://admin.example.org", - cgiurl => "http://admin.wiki.example.org/ikiwiki.nb.cgi", + cgiurl => "http://admin.example.org/ikiwiki.nb.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/nb", underlaydirs => [ #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", |