diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:17:07 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:17:07 +0200 |
| commit | 53a8818d9adc7508bce04d3dafa76f1f5c72d466 (patch) | |
| tree | 69d63e7a7f387cfd65e1a75184858e81b2edec82 | |
| parent | 6f02d1f72af3f86145d4e68dcedf28d7475d95f2 (diff) | |
| parent | 205b52e8f5610cd4dfd5e8c46812efe697b6cdc7 (diff) | |
Merge branch 'nonedit' into allinone-nb
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 576d0f9..02162d6 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.cgi", + cgiurl => "http://admin.example.org/ikiwiki.cgi", templatedir => $ENV{'HOME'} . "/private_webdata/samplewiki/templates_l10n/nb", underlaydirs => [ #$ENV{'HOME'} . "/private_webdata/samplewiki/smiley_l10n/nb", |