summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-30 02:18:47 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-30 02:18:47 +0200
commit7d4d5e70a554cb3bc37dcfcd6164f42668cd2ac6 (patch)
treeb0c01f81d3ac80017abb44ccdfa6be729c0360c5 /po
parent9fb0039ae2c0e7d1b6ae44376ce304a55793b69a (diff)
parent53a8818d9adc7508bce04d3dafa76f1f5c72d466 (diff)
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved): ikiwiki_nb_admin.setup
Diffstat (limited to 'po')
0 files changed, 0 insertions, 0 deletions