diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:23:10 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:23:10 +0200 |
| commit | 376e909a5e6f5b2f6c4bf75836c08ca9f77816ce (patch) | |
| tree | 410ae3fb9c276bb124712afde120742a20ac8a96 | |
| parent | 289cd73b5cc44bcc69ad693ddeba07b807d9a349 (diff) | |
| parent | dd3a23c7106aa45e537c2ae54353320d33d08add (diff) | |
Merge branch 'nb' into _multilang
Conflicts (manually resolved):
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 9a05bf3..3578c72 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -143,7 +143,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) |