Dominik Schürmann 520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development ...

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

2015-05-04 14:42:21 +02:00

..

assets

…

java

Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development

2015-05-04 14:42:21 +02:00

res

Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development

2015-05-04 14:42:21 +02:00

AndroidManifest.xml

API: Allow selection of decryption keys when decryption fails

2015-04-30 18:45:43 +02:00