Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test

Browse Source

Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell

...

This commit is contained in:

Vincent Breitmoser

2014-07-09 16:39:26 +02:00

parent 718acbf954 78b0c5e74a

commit a9c3d6b507

14 changed files with 426 additions and 220 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

OpenKeychain-Test/src/test/resources/public-key-canonicalize.blob Normal file

Binary file not shown.