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 committed 2015-03-24 13:19:43 +01:00

2 parents c694d73cab eeccd7cd14

commit 040cf42cb0

235 files changed

+10182 -8382

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: 70a17dcbeb...9abb91d3a6.

extern/snackbar

Vendored

+1 -1

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