summaryrefslogtreecommitdiff
path: root/ikiwiki.admin.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-04-13 15:48:24 +0200
committerJonas Smedegaard <dr@jones.dk>2008-04-13 15:48:24 +0200
commitb50d4c1f4cd2aa88440f5d01465f73aa987210c2 (patch)
tree8cd60f696344817ff563c5a9e27094a49a8a381e /ikiwiki.admin.setup
parent4e8adf29ab24fec68a1e5ac8ccb5553a3ff25133 (diff)
parentf2ef77fe6c56e979a64f307ff44b9b575b9d12f2 (diff)
Merge branch 'master' of debian@coreander:/srv/git/source.jones.dk/ikiwiki
Manually resolved conflicts: .gitignore Makefile ikiwiki.setup
Diffstat (limited to 'ikiwiki.admin.setup')
0 files changed, 0 insertions, 0 deletions