Vincent Breitmoser
abce05d529
Merge remote-tracking branch 'origin/development' into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java
2015-03-20 14:01:07 +01:00
..
2015-02-27 22:46:48 +01:00
2015-02-26 17:37:28 +01:00
2015-03-20 06:31:18 +08:00
2015-03-20 06:31:18 +08:00
2015-03-20 06:31:18 +08:00
2015-03-20 06:31:18 +08:00
2015-03-20 06:31:18 +08:00
2015-03-20 06:31:18 +08:00
2015-02-27 22:26:11 +01:00
2015-03-19 17:16:23 +01:00
2015-03-16 15:05:39 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-20 14:01:07 +01:00
2015-03-10 16:19:46 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-11 20:52:00 +05:30
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-10 16:19:46 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-10 16:19:46 +01:00
2015-03-10 16:19:46 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-03 20:15:09 +01:00
2015-03-19 17:16:23 +01:00
2015-03-19 17:16:23 +01:00
2015-03-05 16:57:57 +01:00