diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:36:33 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:36:33 +0200 |
| commit | a512a752158af238812625c2c482f518ac7927a2 (patch) | |
| tree | a04c72a570fbd06d0a9848f196c220649cd75eb0 | |
| parent | 5c6ebcebf9fcfb8a604f0e7ac23a4699d5e10a1a (diff) | |
| parent | b2b6e059f4b9db331140074304f053febc2b7fa5 (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 008197b..68e51f8 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 => $ENV{'HOME'} . '/public_websites/git.example.org/samplewiki_content.git/hooks/post-update-ikiwiki-da', # mode for git_wrapper (can safely be made suid) #git_wrappermode => '06755', # gitweb url to show file history ([[file]] substituted) |