aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test/src/test/resources
diff options
context:
space:
mode:
authordanielnelz <daniel.nelz@outlook.com>2015-03-09 20:25:03 +0100
committerdanielnelz <daniel.nelz@outlook.com>2015-03-09 20:25:03 +0100
commit704821a8db88c765964a48ad207cad4154e2e535 (patch)
tree7e3b72c88ae76711ada8b27bb13bc7322501437e /OpenKeychain-Test/src/test/resources
parent7d27faf00c42ce1ad6311c5fadc37c62ba999150 (diff)
parentcc66435e38248880fee3af795619b5794b65d222 (diff)
downloadopen-keychain-704821a8db88c765964a48ad207cad4154e2e535.tar.gz
open-keychain-704821a8db88c765964a48ad207cad4154e2e535.tar.bz2
open-keychain-704821a8db88c765964a48ad207cad4154e2e535.zip
Merge remote-tracking branch 'upstream/development' into development
Diffstat (limited to 'OpenKeychain-Test/src/test/resources')
0 files changed, 0 insertions, 0 deletions