diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:49:20 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-18 09:49:20 +0200 |
| commit | b332aacabb93ce9116d49c6cd2a42b89cfce2fc3 (patch) | |
| tree | 87dbb07bca25d3c2f21a2d3005102011a683e1c4 /OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README | |
| parent | 306bea5ee95576cd5428fe9ab9289fe428a86c6e (diff) | |
| parent | cc63b0e72c32fb405496b85bf484b8241ab7bea6 (diff) | |
| download | open-keychain-b332aacabb93ce9116d49c6cd2a42b89cfce2fc3.tar.gz open-keychain-b332aacabb93ce9116d49c6cd2a42b89cfce2fc3.tar.bz2 open-keychain-b332aacabb93ce9116d49c6cd2a42b89cfce2fc3.zip | |
Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master
Conflicts:
OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
Diffstat (limited to 'OpenKeychain-Test/src/test/resources/OpenPGP-Haskell/README')
0 files changed, 0 insertions, 0 deletions