Merge branch 'save-key-workaround' of https://github.com/honnel/openpgp-keychain into save-key-workaround

Browse Source

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

...

This commit is contained in:

Daniel Hammann

2014-03-22 15:46:30 +01:00

parent 9c18062951 4e285d9254

commit 36376c4999

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

Diff Content Not Available