diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-15 01:04:25 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 01:04:22 +0200 |
| commit | d06ae7f691e3bf1984cb79f94aa5a455c88f36f8 (patch) | |
| tree | 64792b08a90d5987158b9cbe5bb8a575317b0b54 /OpenKeychain/src/main/assets | |
| parent | b509c3ed399c07de02cbf777010cc4806db16cda (diff) | |
| download | open-keychain-d06ae7f691e3bf1984cb79f94aa5a455c88f36f8.tar.gz open-keychain-d06ae7f691e3bf1984cb79f94aa5a455c88f36f8.tar.bz2 open-keychain-d06ae7f691e3bf1984cb79f94aa5a455c88f36f8.zip | |
yubikey: don't assume signing key is masterKeyId in ViewKeyActivity
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
Diffstat (limited to 'OpenKeychain/src/main/assets')
0 files changed, 0 insertions, 0 deletions