summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-08-31 16:22:26 +0200
committerJonas Smedegaard <dr@jones.dk>2010-08-31 16:22:26 +0200
commit1ee90b73470289496a60f6e9bf5c4d6e889df66b (patch)
tree36c5b8c7c78b50a86e31eef1b1b9a3762a290ffa /themes
parentfff174199f67fd16d99928da6966b0a1d42ee960 (diff)
parente21cb3e0d708449b29d0ab9b66e4f7b25aaefe8a (diff)
Merge branch 'allinone-da' into allinone-multilang
Conflicts (manually resolved): ikiwiki_da.setup
Diffstat (limited to 'themes')
0 files changed, 0 insertions, 0 deletions