summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 16:21:06 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 16:21:06 +0200
commitfff174199f67fd16d99928da6966b0a1d42ee960 (patch)
tree1fc39b01d123ddd5beabeb9abb4814cd9bf0beba /templates
parente2ae264d5d6327ac1e45f422150d2dd518ac8f68 (diff)
parentcca56fb84cb317dcc2fe2427f2f661546fe2a83d (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved): ikiwiki.setup
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions