summaryrefslogtreecommitdiff
path: root/privdata/keyring.gpg
AgeCommit message (Collapse)Author
2014-08-19remove privdata from master, to avoid conflicts with other users' privdataJoey Hess
This will result in some easily resolved merge conflicts when I merge joeyconfig into master. I never merge master into joeyconfig so that's ok.
2014-03-31propellor addkeyJoey Hess