Merge branch 'revocation-status' of https://github.com/honnel/openpgp-keychain into revocation-status

Browse Source

Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java

...

This commit is contained in:

Daniel Hammann 2014-03-18 16:40:22 +01:00

parent 2d3f47eb99 93447bf3f8

commit 0550b22b49

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

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

Diff Content Not Available