aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/androidTest
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-06-11 17:12:07 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-06-11 17:12:07 +0200
commitbaea31847022ce88906a0190638ddffed82c8a7c (patch)
treecdd080f224a82a377295a02f64f62fb7534012cb /OpenKeychain/src/androidTest
parentc8790f404aaf76db967a16c8fea79eb6f90c8bce (diff)
parent98ba424576946d2f5ef529c5506113b71b0266c4 (diff)
downloadopen-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.gz
open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.bz2
open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.zip
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/androidTest')
0 files changed, 0 insertions, 0 deletions