summaryrefslogtreecommitdiff
path: root/ikiwiki_admin.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 17:20:27 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 17:20:27 +0200
commit5b9702f32e0d8df28bd7019443a2aea56132049f (patch)
tree6475f22f77f882e37f3c5d009ec00f0629b68868 /ikiwiki_admin.setup
parent86b629053ff7f0dbf984aa2236b63dba0616957d (diff)
parent077f4b7319c36f2c8bc243b462a992f10e896573 (diff)
Merge branch 'master' into nonedit
Conflicts (manually resolved: merge old and new parts): .gitmodules
Diffstat (limited to 'ikiwiki_admin.setup')
0 files changed, 0 insertions, 0 deletions