summaryrefslogtreecommitdiff
path: root/ikiwiki_admin.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 17:23:13 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 17:23:13 +0200
commit866905908c179b30553aa448dc04f2092bdd951c (patch)
tree935c01d73238245c8db40cc1f0114f2d00185918 /ikiwiki_admin.setup
parentc4a53e9b62f5f912038b8148e010d37b44a0a3ad (diff)
parent0195f9d307c7c184f3e056a816124d24ae272531 (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved: merge old and new parts): .gitmodules
Diffstat (limited to 'ikiwiki_admin.setup')
0 files changed, 0 insertions, 0 deletions