diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:16:51 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:16:51 +0200 |
| commit | bd3fdf887bdfc2f935214847a68805b174fcf2d3 (patch) | |
| tree | be76a4cce8c35062482901c04f986f194cd6a4e5 | |
| parent | 5b188df8f30768d182e6d7cdc0d07fa86dd8f653 (diff) | |
| parent | eda71b62ac34cea62eb9745283443a7813fd383f (diff) | |
Merge branch 'da' into _multilang
Conflicts (resolved manually):
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 68e51f8..b581763 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.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-da', + git_wrapper => $gitdir . '/post-update-ikiwiki-da', # mode for git_wrapper (can safely be made suid) #git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) |