diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-13 17:00:14 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-13 17:00:14 +0100 |
commit | 004c944bb752004f134a55df3053088d4b147a9c (patch) | |
tree | 94f7ac73fd940e8483ed2a963708776bb9750803 /OpenKeychain/src/main | |
parent | 712e526ab56649a252958818b2c1320f81e19142 (diff) | |
parent | ad03031d242e7372eef48c2ee1a03238e7737a79 (diff) | |
download | open-keychain-004c944bb752004f134a55df3053088d4b147a9c.tar.gz open-keychain-004c944bb752004f134a55df3053088d4b147a9c.tar.bz2 open-keychain-004c944bb752004f134a55df3053088d4b147a9c.zip |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'OpenKeychain/src/main')
0 files changed, 0 insertions, 0 deletions