diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:42 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-26 01:02:42 +0200 |
commit | 68b3c22f7b0d0da83405ec92488d164a83e3715f (patch) | |
tree | 53c349f5ac50e1e0eeefc35d52d91caa1746a7b9 /OpenKeychain/src/main/java/org | |
parent | 1865852cccccf0b78ffe8bcdc0cfbca66ddebfdc (diff) | |
parent | 4732bc5744a1d1e29a4deaf7ab94e604e23da31c (diff) | |
download | open-keychain-68b3c22f7b0d0da83405ec92488d164a83e3715f.tar.gz open-keychain-68b3c22f7b0d0da83405ec92488d164a83e3715f.tar.bz2 open-keychain-68b3c22f7b0d0da83405ec92488d164a83e3715f.zip |
Merge remote-tracking branch 'origin/development' into linked-identities
Diffstat (limited to 'OpenKeychain/src/main/java/org')
0 files changed, 0 insertions, 0 deletions