summaryrefslogtreecommitdiff
path: root/ikiwiki_nb_admin.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 22:58:37 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 22:58:37 +0200
commit9f932a5d3778ee712a21795376f87e43250fabf8 (patch)
treefacee04057194eca0edfc3f808ac9da2c85b2647 /ikiwiki_nb_admin.setup
parentfb21424b98cceb044bb561be5558b24a46e32883 (diff)
parentd996aebbe310664120a5096a9617385aedcb25d5 (diff)
Merge branch 'wian' into allinone-nb
Conflicts: basewiki templates
Diffstat (limited to 'ikiwiki_nb_admin.setup')
0 files changed, 0 insertions, 0 deletions