summaryrefslogtreecommitdiff
path: root/privdata/keyring.gpg
diff options
context:
space:
mode:
authorJoey Hess2014-11-11 20:04:55 -0400
committerJoey Hess2014-11-11 20:04:55 -0400
commiteba2d3d2cd7337868ba9601f5aba0ff3f9392bb9 (patch)
treefaf020ef359b2496ddf9ddd1c5c0d7644fbd024b /privdata/keyring.gpg
parent08ff95fbfaf867ad5a6acdecfd0eb1e84ed44fd9 (diff)
parente7d2c38a59c8ffed26da04e7e46d1ebbdfe08c5e (diff)
Merge branch 'joeyconfig'
Conflicts: privdata/privdata.gpg
Diffstat (limited to 'privdata/keyring.gpg')
0 files changed, 0 insertions, 0 deletions