diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:25:57 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:25:57 +0200 |
| commit | a04de07a87e13c7a39773ca0a45ec749a6396718 (patch) | |
| tree | 785d984545aa595d6a5cfe35ecded37bb3aa3aa5 /ikiwiki_nb.setup | |
| parent | 0bc7dd3fe72fc0af48876eb9b4bab0aa05b2036b (diff) | |
| parent | 376e909a5e6f5b2f6c4bf75836c08ca9f77816ce (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
ikiwiki.setup
Diffstat (limited to 'ikiwiki_nb.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 e887979..30b3e15 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -147,7 +147,7 @@ use IkiWiki::Setup::Standard { # git plugin # git hook to generate - git_wrapper => $gitdir . '/post-update-ikiwiki-nb', + git_wrapper => $builddir . '/git/post-update-ikiwiki-nb', # mode for git_wrapper (can safely be made suid) git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) |