diff options
| author | Daniel Hammann <github@honnel.de> | 2014-03-18 16:40:22 +0100 |
|---|---|---|
| committer | Daniel Hammann <github@honnel.de> | 2014-03-18 16:40:22 +0100 |
| commit | 0550b22b49b3c05ad4138476ef155b7e230b2a23 (patch) | |
| tree | ebd4d010f69a27de55892b1be9049365aae05d78 /libraries/HtmlTextView/src | |
| parent | 2d3f47eb99c18b188ed6e4f396605d6b0340de16 (diff) | |
| parent | 93447bf3f866efe35d3fe7713693ccb03ec2628e (diff) | |
| download | open-keychain-0550b22b49b3c05ad4138476ef155b7e230b2a23.tar.gz open-keychain-0550b22b49b3c05ad4138476ef155b7e230b2a23.tar.bz2 open-keychain-0550b22b49b3c05ad4138476ef155b7e230b2a23.zip | |
Merge branch 'revocation-status' of https://github.com/honnel/openpgp-keychain into revocation-status
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
Diffstat (limited to 'libraries/HtmlTextView/src')
0 files changed, 0 insertions, 0 deletions