diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:17:20 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:17:20 +0200 |
| commit | b3eb7f8f6989cb6abb7ddc5a0b4ceceae2d366fd (patch) | |
| tree | 9196dbff49c071d3e57c8be5bce7331ffc17ec89 | |
| parent | 81d91709d53dc6cd385787bdf6d7c76cded63f53 (diff) | |
| parent | a56aded4649c542f410eb834f0765e384819854e (diff) | |
Merge branch '_multilang' into allinone-multilang
| -rw-r--r-- | ikiwiki_da.setup | 4 | ||||
| -rw-r--r-- | ikiwiki_nb.setup | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ikiwiki_da.setup b/ikiwiki_da.setup index 041ec75..19d9517 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -27,10 +27,10 @@ use IkiWiki::Setup::Standard { # Git stuff. #rcs => "git", - #historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master + #historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]];hb=master-da", #diffurl => "http://git.example.org/?p=samplewiki_content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", #gitorigin_branch => "samplewiki", - #gitmaster_branch => "master", + #gitmaster_branch => "master-da", wrappers => [ #{ diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index e54333d..fc87411 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -27,10 +27,10 @@ use IkiWiki::Setup::Standard { # Git stuff. #rcs => "git", - #historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]]", # ;hb=master + #historyurl => "http://git.example.org/?p=samplewiki_content.git;a=history;f=[[file]];hb=master-nb", #diffurl => "http://git.example.org/?p=samplewiki_content.git;a=blobdiff;h=[[sha1_to]];hp=[[sha1_from]];hb=[[sha1_parent]];f=[[file]]", #gitorigin_branch => "samplewiki", - #gitmaster_branch => "master", + #gitmaster_branch => "master-nb", wrappers => [ #{ |