diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-01 10:15:46 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-01 10:15:46 +0200 |
commit | af5fc6622943acc20948f4daf8ae13fb80e4ef5d (patch) | |
tree | 066c76b0cec20c735e93794e0dadee5e44f5c770 /Graphics/screenshots/device-2015-05-06-141517.png | |
parent | 784dbc087e82826269ed58cc61e64b2b89c40dfe (diff) | |
parent | 93f3a98eae1fdd8f9a3a82d415a7284548a2e4bf (diff) | |
download | open-keychain-af5fc6622943acc20948f4daf8ae13fb80e4ef5d.tar.gz open-keychain-af5fc6622943acc20948f4daf8ae13fb80e4ef5d.tar.bz2 open-keychain-af5fc6622943acc20948f4daf8ae13fb80e4ef5d.zip |
Merge pull request #1317 from adithyaphilip/master
Merge key from Keyserver with that from Keybase instead of replacing
Diffstat (limited to 'Graphics/screenshots/device-2015-05-06-141517.png')
0 files changed, 0 insertions, 0 deletions