diff options
author | Tim Bray <timbray@gmail.com> | 2014-05-23 09:42:32 -0700 |
---|---|---|
committer | Tim Bray <timbray@gmail.com> | 2014-05-23 09:42:32 -0700 |
commit | 58da3d12b0a59a32054478c53e6c5a219b71f61f (patch) | |
tree | 9b2baff477a5b9b58e366a05633f6c4e8642b174 /OpenKeychain/src/androidTest | |
parent | 1ff3962acc755e44a011dd9ab9ced4d3593d1fb9 (diff) | |
download | open-keychain-58da3d12b0a59a32054478c53e6c5a219b71f61f.tar.gz open-keychain-58da3d12b0a59a32054478c53e6c5a219b71f61f.tar.bz2 open-keychain-58da3d12b0a59a32054478c53e6c5a219b71f61f.zip |
Finished cleaning up rebase conflicts post Keyserver exception refactor
Diffstat (limited to 'OpenKeychain/src/androidTest')
0 files changed, 0 insertions, 0 deletions