summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 20:37:00 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 20:37:00 +0200
commit5045a055d80c8d1147e893dbf59fd9590fd21318 (patch)
treee58445bfce86014ade93b334664612c445890dfe
parenta512a752158af238812625c2c482f518ac7927a2 (diff)
parentcba18592fa1db4c492cb99b29dfa8e23edee0f84 (diff)
Merge branch 'nb' into _multilang
Conflicts (manually resolved): ikiwiki_nb.setup
-rw-r--r--ikiwiki_nb.setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup
index 182ba39..fcfe72b 100644
--- a/ikiwiki_nb.setup
+++ b/ikiwiki_nb.setup
@@ -123,7 +123,7 @@ use IkiWiki::Setup::Standard {
# git plugin
# git hook to generate
- #git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb',
+ git_wrapper => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-nb',
# mode for git_wrapper (can safely be made suid)
#git_wrappermode => '06755',
# gitweb url to show file history ([[file]] substituted)