Merge branch 'development' into v/crypto-input-parcel

Browse Source

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java

...

This commit is contained in:

Dominik Schürmann

2015-03-24 13:19:43 +01:00

parent c694d73cab eeccd7cd14

commit 040cf42cb0

235 changed files with 10182 additions and 8382 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: 70a17dcbeb...9abb91d3a6

2

extern/snackbar vendored

Submodule extern/snackbar updated: 025ecadc59...97cda0806d