summaryrefslogtreecommitdiff
path: root/basewiki_nb
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-30 20:36:33 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-30 20:36:33 +0200
commita512a752158af238812625c2c482f518ac7927a2 (patch)
treea04c72a570fbd06d0a9848f196c220649cd75eb0 /basewiki_nb
parent5c6ebcebf9fcfb8a604f0e7ac23a4699d5e10a1a (diff)
parentb2b6e059f4b9db331140074304f053febc2b7fa5 (diff)
Merge branch 'da' into _multilang
Conflicts (manually resolved): ikiwiki_da.setup
Diffstat (limited to 'basewiki_nb')
0 files changed, 0 insertions, 0 deletions