summaryrefslogtreecommitdiff
path: root/po/smiley.da.po
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-03 16:24:07 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-03 16:24:07 +0200
commit0fc04953de8cf64366b4d24550c40a1bba065b2a (patch)
tree4dcb33e3e9ca01ca72875d282589c8b5e3886d16 /po/smiley.da.po
parente7f2facb315551d43f0f129129e993d283a7cea6 (diff)
parent2c9737904f3fb2f9875d159b5a634f1ca5cab635 (diff)
Merge branch '_nb' into allinone-nb
Conflicts (manually resolved): ikiwiki_nb.setup
Diffstat (limited to 'po/smiley.da.po')
0 files changed, 0 insertions, 0 deletions