summaryrefslogtreecommitdiff
path: root/ikiwiki_da.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-08-11 11:23:44 +0200
committerJonas Smedegaard <dr@jones.dk>2008-08-11 11:23:44 +0200
commit5cea5d62e2bbe1558b4b930efaea97dc8f4116e6 (patch)
tree2cab40b478ac994b0475bf7595b6c75653a87f75 /ikiwiki_da.setup
parent63c1477123651ccaac5a817992578ae37094d953 (diff)
parent3aa64f2c1b42806b5d38e0a20feedcf01122384d (diff)
Merge branch 'master' into nonedit
Conflicts (manually resolved): ikiwiki.setup Also, examplewiki -> samplewiki applied to admin setup too.
Diffstat (limited to 'ikiwiki_da.setup')
0 files changed, 0 insertions, 0 deletions