diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:22:42 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-09-03 16:22:42 +0200 |
| commit | 289cd73b5cc44bcc69ad693ddeba07b807d9a349 (patch) | |
| tree | a72325459549c5c1cb057fdaa592cc790e5f5db3 | |
| parent | 3f6c6012b240be3c4286912ad5a065821d883fbf (diff) | |
| parent | bd56e079facdecce4acc8dd7cc15c702f05547b7 (diff) | |
Merge branch 'da' into _multilang
Conflicts (manually resolved):
ikiwiki_da.setup
| -rw-r--r-- | ikiwiki_da.setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 89fbcf4..1e8a2a7 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -143,7 +143,7 @@ use IkiWiki::Setup::Standard { # git plugin # git hook to generate - git_wrapper => $gitdir . '/post-update-ikiwiki-da', + git_wrapper => $builddir . '/git/post-update-ikiwiki-da', # mode for git_wrapper (can safely be made suid) git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) |