summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 17:01:30 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 17:01:30 +0200
commit7d1456c585488d31dab8429ac6ffa959441c83fb (patch)
tree15d4b264052d56c26c523ab9470488585e252fa5 /themes
parentf96b7a3d174bdb8429781a2e5e9ddc2137d9414e (diff)
parent3859a1938ba5d0f0eb30c2a15d3b6b628c667ef9 (diff)
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved): ikiwiki_da.setup ikiwiki_nb.setup
Diffstat (limited to 'themes')
0 files changed, 0 insertions, 0 deletions