moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-03-03 10:51:49 -05:00
Code Issues Releases Wiki Activity
c0ebc92611
open-keychain/OpenKeychain
History
Dominik Schürmann c0ebc92611 Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2014-08-28 11:00:18 +02:00
..
src/main
Merge branch 'master' into yubikey
2014-08-28 11:00:18 +02:00
.gitignore
Fix gitignore for lint
2014-04-09 16:36:28 +02:00
build.gradle
Merge branch 'master' into yubikey
2014-08-06 01:08:12 +02:00