diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:14:25 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-30 02:14:25 +0200 |
| commit | 93208b70e2ac342def5f07c82cae0dac482fae95 (patch) | |
| tree | 1898f5032a554c5348b856926cc7e383ea06ab65 | |
| parent | 6a261418526b0076f4a9f5ed7440d2db4735def5 (diff) | |
| parent | a56aded4649c542f410eb834f0765e384819854e (diff) | |
Merge branch '_multilang' into 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 f34c5a7..009d616 100644 --- a/ikiwiki_da.setup +++ b/ikiwiki_da.setup @@ -33,10 +33,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", # Tla stuff. #rcs => "tla" diff --git a/ikiwiki_nb.setup b/ikiwiki_nb.setup index f71c264..94b5c5f 100644 --- a/ikiwiki_nb.setup +++ b/ikiwiki_nb.setup @@ -33,10 +33,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", # Tla stuff. #rcs => "tla" |