Vincent Breitmoser
20a6c5ce8a
Merge tag 'v3.2.1' into linked-identities
Version 3.2.1
Conflicts:
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
OpenKeychain/src/main/res/values/strings.xml
2015-05-11 17:28:34 +02:00
..
2015-04-17 17:30:03 +02:00
2015-03-06 01:52:06 +01:00
2015-01-14 14:52:23 +01:00
2015-02-25 02:35:09 +01:00
2015-02-03 19:13:02 +01:00
2015-02-21 20:46:37 +01:00
2015-02-22 21:16:40 +01:00
2015-02-03 19:13:02 +01:00
2015-05-06 14:03:52 +02:00
2015-05-06 14:22:53 +02:00
2015-04-17 17:30:03 +02:00
2015-03-09 13:27:24 +01:00
2015-02-25 02:35:09 +01:00
2015-03-09 13:27:24 +01:00
2015-03-09 13:27:24 +01:00
2015-02-25 02:35:09 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-02-25 02:35:09 +01:00
2015-03-04 19:04:15 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-03-26 16:30:49 +01:00
2015-03-26 16:30:49 +01:00
2015-03-26 16:30:49 +01:00
2015-03-26 16:30:49 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01:00
2015-03-15 22:10:05 +01:00
2015-01-14 14:52:23 +01:00
2015-03-21 22:18:58 +01:00