diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-10 14:49:02 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-10 14:49:02 +0200 |
commit | 9b6416943b49d620c73bd24fb334ec338d95c5a8 (patch) | |
tree | 8092117da0145cfb333e96648b7ffdbbb877fda2 /OpenKeychain/src/androidTest/java/org/sufficientlysecure | |
parent | 074b6633b015aba84f8f60a05878a93d4b8ec9b2 (diff) | |
parent | e6ea98fabc03f98055aaede3f456f43b294990f9 (diff) | |
download | open-keychain-9b6416943b49d620c73bd24fb334ec338d95c5a8.tar.gz open-keychain-9b6416943b49d620c73bd24fb334ec338d95c5a8.tar.bz2 open-keychain-9b6416943b49d620c73bd24fb334ec338d95c5a8.zip |
Merge remote-tracking branch 'origin/master' into v/eventbus
Diffstat (limited to 'OpenKeychain/src/androidTest/java/org/sufficientlysecure')
0 files changed, 0 insertions, 0 deletions