summaryrefslogtreecommitdiff
path: root/ikiwiki.setup
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-10-02 00:43:19 +0200
committerJonas Smedegaard <dr@jones.dk>2010-10-02 00:43:19 +0200
commit7dce6ac4a1cf590af687a6a3c1bcd216df478205 (patch)
tree65937c16121da25d140e4dd14e7a790eee1e96fc /ikiwiki.setup
parent59c2906de93b29e7321114b6c5623479fb182da6 (diff)
parent309681793c2c86f697308e96e3398389fb1f708c (diff)
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved): ikiwiki_nb_admin.setup
Diffstat (limited to 'ikiwiki.setup')
0 files changed, 0 insertions, 0 deletions