diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 17:44:53 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-14 17:44:53 +0200 |
| commit | 3593e35c79d6dc87cb75fe5987d3ee113caa846e (patch) | |
| tree | a33b2a7c829fc3e1d4eac99795097b6cd11507b9 /ikiwiki_nb.setup | |
| parent | e400d1744b0acd8a06f8bd535945cbdb143f2aa3 (diff) | |
| parent | cceedc3ff37025a679d6be0e36e3ef682b01a9c4 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (resolved manually):
.gitmodules
basewiki_da
basewiki_nb
ikiwiki_da.setup
ikiwiki_nb.setup
templates_da
templates_nb
Diffstat (limited to 'ikiwiki_nb.setup')
0 files changed, 0 insertions, 0 deletions