diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-22 22:21:19 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-22 22:21:19 +0100 |
commit | 5227b45af8e86484f6cedb0fd67c591d065d2361 (patch) | |
tree | aa182a4087951c257df1401e79f57073eacbb46a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java | |
parent | b2365fcb97f5dd271df1b8da1a770131201fc2e8 (diff) | |
parent | 8b4388e1a2d5cb2b7f0524c18ad3383e3375ba7b (diff) | |
download | open-keychain-5227b45af8e86484f6cedb0fd67c591d065d2361.tar.gz open-keychain-5227b45af8e86484f6cedb0fd67c591d065d2361.tar.bz2 open-keychain-5227b45af8e86484f6cedb0fd67c591d065d2361.zip |
Merge branch 'development' into v/crypto-input-parcel
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java')
0 files changed, 0 insertions, 0 deletions