Vincent Breitmoser
b4aec3114d
Merge branch 'development' into linked-identities
Conflicts:
Graphics/update-drawables.sh
OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java
OpenKeychain/build.gradle
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
2015-04-24 14:18:01 +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-01-14 14:52:23 +01:00
2015-01-14 14:52:23 +01: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