summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2014-12-17 16:31:09 -0400
committerJoey Hess2014-12-17 16:31:09 -0400
commit8cc691dc868f1f43d985fea012dc84183b70341d (patch)
treeab8485a66aa75c15e7dfdd2f00ab6011786e6b2d /doc
parentdb3f9050d6f4a098b82ae014a6a6e5e96a3067f6 (diff)
parentddeee3ceb8ef5aa94ffc0696bff085eb031309d6 (diff)
Merge branch 'joeyconfig'
Conflicts: privdata.joey/privdata.gpg
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions