summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJoey Hess2016-04-02 15:33:49 -0400
committerJoey Hess2016-04-02 15:33:49 -0400
commit6b2f90a4b4b0987277035fa4c085ea0631e689bb (patch)
treed305711cd56e4c889435317ab3ca2ea21807a008 /doc
parentdce7e7bd72fa82ef7461535288b53d89db807566 (diff)
clean up after merge
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions