summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2016-06-14 00:03:49 -0400
committerJoey Hess2016-06-14 00:03:49 -0400
commit018ded2fa970992b8cb645b1ac938c1587a8b07f (patch)
tree33e3e22b272b18b28ea793fdc14f2b9365d98613 /doc
parent0c6dd6b3b39a1e4b1b350d7712cab74579cffbb5 (diff)
clean up after merge
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions