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 /ikiwiki_nb.setup | |
| parent | 5c6ebcebf9fcfb8a604f0e7ac23a4699d5e10a1a (diff) | |
| parent | b2b6e059f4b9db331140074304f053febc2b7fa5 (diff) | |
Merge branch 'da' into _multilang
Conflicts (manually resolved):
ikiwiki_da.setup
Diffstat (limited to 'ikiwiki_nb.setup')
0 files changed, 0 insertions, 0 deletions