summaryrefslogtreecommitdiff
path: root/basewiki
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-09-03 16:25:57 +0200
committerJonas Smedegaard <dr@jones.dk>2010-09-03 16:25:57 +0200
commita04de07a87e13c7a39773ca0a45ec749a6396718 (patch)
tree785d984545aa595d6a5cfe35ecded37bb3aa3aa5 /basewiki
parent0bc7dd3fe72fc0af48876eb9b4bab0aa05b2036b (diff)
parent376e909a5e6f5b2f6c4bf75836c08ca9f77816ce (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved): ikiwiki.setup
Diffstat (limited to 'basewiki')
0 files changed, 0 insertions, 0 deletions