Vincent Breitmoser f9ef1160ca Merge branch 'development' into linked-identities ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

2015-03-24 15:29:58 +01:00

..

CertifyActionsParcel.java

return key ids from PassphraseDialogActivity, accept null userids

2015-03-08 04:41:41 +01:00

ContactSyncAdapterService.java

rewrite PgpSignEncrypt data flow

2015-02-01 23:14:26 +01:00

DummyAccountService.java

Optimize imports

2014-08-05 22:46:00 +02:00

KeychainIntentService.java

Merge branch 'development' into linked-identities

2015-03-24 15:29:58 +01:00

KeychainIntentServiceHandler.java

Reworked Notify class

2015-03-20 19:49:42 +05:30

PassphraseCacheService.java

New Passphrase class for safer passphrase handling in memory

2015-03-19 03:03:46 +01:00

SaveKeyringParcel.java

New Passphrase class for safer passphrase handling in memory

2015-03-19 03:03:46 +01:00