cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d1b0d0fa5e3a49337af53ea86c779c72e4db8567
open-keychain/OpenPGP-Keychain/src
History
Vincent Breitmoser d1b0d0fa5e Merge remote-tracking branch 'origin/master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
2014-04-06 04:35:05 +02:00
..
main
Merge remote-tracking branch 'origin/master' into certs
2014-04-06 04:35:05 +02:00
test/java/org/sufficientlysecure/keychain
test: add junit+robolectric to buildfiles and stub test file
2014-04-01 16:12:57 +02:00