Files
open-keychain/OpenKeychain
Vincent Breitmoser d06ae7f691 yubikey: don't assume signing key is masterKeyId in ViewKeyActivity
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
2015-05-17 01:04:22 +02:00
..
2015-05-10 10:44:04 +02:00