open-keychain/OpenKeychain-Test
Daniel Albert d63534d655 Merge remote-tracking branch 'upstream/master'
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
2014-07-16 18:49:16 +02:00
..
src/test Merge remote-tracking branch 'upstream/master' 2014-07-16 18:49:16 +02:00
build.gradle put unit tests into external module (CAVEAT) 2014-07-09 16:03:30 +02:00