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

2015-01-27 09:46:42 +01:00

parent fd29d27e61 e77f9a5351

commit e8780b4410

13 changed files with 188 additions and 58 deletions

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

2

extern/openpgp-api-lib vendored

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