aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-11-12 07:32:20 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2014-11-12 07:32:20 +0100
commit4dab361b1bcc00bba1525fdc3cfd8658c62e6aec (patch)
treec6d65d65dbcdf042b87172160c5ceeb58198e28b /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
parent9de76bb903ade8c4cf3f3e1fb16af4f3ff002065 (diff)
parent36bac67dd5f19b72a58584f2fab104e6e26df66a (diff)
downloadopen-keychain-4dab361b1bcc00bba1525fdc3cfd8658c62e6aec.tar.gz
open-keychain-4dab361b1bcc00bba1525fdc3cfd8658c62e6aec.tar.bz2
open-keychain-4dab361b1bcc00bba1525fdc3cfd8658c62e6aec.zip
Merge branch 'timbray-development' into keybase-proofs
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java')
0 files changed, 0 insertions, 0 deletions