summaryrefslogtreecommitdiff
path: root/ikiwiki_da.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-27 10:49:02 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-27 10:49:02 +0200
commitb01432549c31b47de2b4cd907585477df5fc4dbd (patch)
tree6b09db86f018fc417b06be42fb4310581b7de677 /ikiwiki_da.setup
parentf6c85c40578a2b2853e4baf4885c1502f806af3d (diff)
parent208082d714a3ab73c14f3e0fe30d861e77aabca7 (diff)
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved): .gitmodules ikiwiki_nb.setup
Diffstat (limited to 'ikiwiki_da.setup')
0 files changed, 0 insertions, 0 deletions