cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e10cbc54c606563b2d06f083bca17119ca585127
open-keychain/OpenKeychain
History
Dominik Schürmann e10cbc54c6 Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
2014-08-01 11:09:25 +02:00
..
src/main
Merge branch 'master' into yubikey
2014-08-01 11:09:25 +02:00
.gitignore
Fix gitignore for lint
2014-04-09 16:36:28 +02:00
build.gradle
Merge branch 'master' into yubikey
2014-08-01 11:09:25 +02:00