diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:47:24 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:47:24 +0200 |
commit | d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82 (patch) | |
tree | 19c5a60504e8c2f7488f66d32c5dc3e617ae55fc /OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | |
parent | 69c38c3f340786fd3e3fe755d2cff6bbb27823e6 (diff) | |
parent | 306bea5ee95576cd5428fe9ab9289fe428a86c6e (diff) | |
download | open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.tar.gz open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.tar.bz2 open-keychain-d8ada7c1bb39e9eb93c8de5534dfe443b6f53c82.zip |
Merge branch 'master' into yubikey
Conflicts:
.gitmodules
Diffstat (limited to 'OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell')
m--------- | OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell b/OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell deleted file mode 160000 -Subproject eba7e4fdce3de6622b4ec3862b405b0acd01637 |