cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e2164f571ed80928527cfdebaf3e2655350e9471
open-keychain/OpenKeychain/src/main/java/org
History
mar-v-in e2164f571e Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-06-05 23:56:29 +02:00
..
sufficientlysecure/keychain
Merge branch 'master' into automatic-contact-discovery
2014-06-05 23:56:29 +02:00