gpg conf
Merge branch 'master' into desktop