open-keychain/OpenKeychain-Test/src/test
Vincent Breitmoser cfa2ecca61 WIP! Merge branch 'v/eventbus' into v/multi-decrypt
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
2015-06-07 00:05:14 +02:00
..
java/org/sufficientlysecure/keychain WIP! Merge branch 'v/eventbus' into v/multi-decrypt 2015-06-07 00:05:14 +02:00
resources fix and test for bad certificate version numbers (#1012) 2015-01-02 01:58:16 +01:00