Dominik Schürmann
6da17ef6bb
Merge branch 'master' into yubikey
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java
2014-08-14 13:31:01 +02:00
..
2014-07-30 00:50:53 +02:00
2014-07-16 09:49:37 +02:00
2014-08-04 16:29:16 +02:00
2014-08-04 16:29:16 +02:00
2014-08-04 16:29:16 +02:00
2014-08-04 16:29:16 +02:00
2014-08-04 16:29:16 +02:00
2014-06-18 22:30:54 +02:00
2014-08-13 21:23:01 +02:00
2014-04-22 08:15:55 +02:00
2014-08-04 00:49:16 +02:00
2014-08-13 18:48:42 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-14 13:31:01 +02:00
2014-08-07 10:01:57 +02:00
2014-08-14 11:44:47 +02:00
2014-08-14 11:44:47 +02:00
2014-08-04 16:33:05 +02:00
2014-08-14 11:44:47 +02:00
2014-08-14 11:44:47 +02:00
2014-08-14 11:44:47 +02:00
2014-04-06 12:57:42 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-07 10:01:57 +02:00
2014-08-04 16:33:05 +02:00
2014-08-07 10:01:57 +02:00
2014-05-07 03:55:06 +02:00
2014-08-07 10:01:57 +02:00
2014-08-14 13:31:01 +02:00