diff options
| author | Tim Bray <tbray@textuality.com> | 2014-11-21 19:45:35 -0800 |
|---|---|---|
| committer | Tim Bray <tbray@textuality.com> | 2014-11-21 19:45:35 -0800 |
| commit | 734a085f0d9350b6aa4053c2d28c0f4e8db5f79a (patch) | |
| tree | 42426847a64030abc483b646e16872e98b1b9b15 /OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png | |
| parent | e72c082acd9f17be4a21970603df0f6a621221d7 (diff) | |
| parent | 9c133d343fbc297ed6f3ee39b74cea5dfcc9c207 (diff) | |
| download | open-keychain-734a085f0d9350b6aa4053c2d28c0f4e8db5f79a.tar.gz open-keychain-734a085f0d9350b6aa4053c2d28c0f4e8db5f79a.tar.bz2 open-keychain-734a085f0d9350b6aa4053c2d28c0f4e8db5f79a.zip | |
Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
Diffstat (limited to 'OpenKeychain/src/main/res/drawable-mdpi/ic_settings_black_24dp.png')
0 files changed, 0 insertions, 0 deletions