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

..

src

Merge branch 'master' into backup-api

2016-05-07 12:01:16 +03:00

.gitignore

…

build.gradle

Version 3.9.6 beta

2016-05-05 14:41:46 +03:00

proguard-rules.pro

Update libraries, add proguard filters to be under 64K limit

2016-04-29 17:03:50 +02:00