summaryrefslogtreecommitdiff
path: root/po/smiley.pot
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-03 16:27:33 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-03 16:27:33 +0200
commit7919f8bdad802db4311cdbc4d20737367d3dabf7 (patch)
tree596b6d44995d4a14200fb10f1fdb7f08bd49404f /po/smiley.pot
parenta04de07a87e13c7a39773ca0a45ec749a6396718 (diff)
parent30b66cc9d018535f5a82f1b1bba8639bad1685ec (diff)
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved): ikiwiki_da.setup
Diffstat (limited to 'po/smiley.pot')
0 files changed, 0 insertions, 0 deletions