Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch ↵ | Vincent Breitmoser | 2014-07-09 | 1 | -0/+0 |
'artbristol/functional-testing-canonicalize-badsignature' into external-test Conflicts: OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell |