cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7dd5e2235339401b44eda13b124f3482472539d4
open-keychain/OpenKeychain/src/main/java/org
History
Dominik Schürmann 7dd5e22353 Merge branch 'master' into backup-api 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	extern/openpgp-api-lib
2016-05-07 12:01:16 +03:00
..
bouncycastle/openpgp
api: allow caching of sessionKey in OpenPgpDecryptResult
2016-04-29 15:46:17 +02:00
sufficientlysecure/keychain
Merge branch 'master' into backup-api
2016-05-07 12:01:16 +03:00