Merge branch 'development' into detached-sigs-api

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java

...

This commit is contained in:

Dominik Schürmann committed 2015-01-27 09:46:42 +01:00

2 parents fd29d27e61 e77f9a5351

commit e8780b4410

13 files changed

+188 -58

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

extern/openpgp-api-lib

Vendored

+1 -1

Submodule extern/openpgp-api-lib updated: 76d7b17f11...edcc61970f.