Vincent Breitmoser
a73e91c49c
Merge branch 'master' into certs
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
2014-03-15 00:18:50 +01:00
..
2014-01-27 14:18:25 +01:00
2014-03-13 20:18:25 +01:00
2014-03-11 00:46:25 +02:00
2014-01-27 14:18:25 +01:00
2014-03-11 00:46:25 +02:00
2014-03-11 00:46:25 +02:00
2014-03-11 00:46:25 +02:00
2014-01-27 14:18:25 +01:00
2014-03-15 00:18:50 +01:00
2014-03-15 00:18:50 +01:00
2014-03-13 19:09:54 +01:00
2014-03-04 22:06:30 +01:00
2014-03-10 22:40:59 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-10 22:40:59 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-02 18:14:49 +01:00
2014-03-15 00:18:50 +01:00
2014-03-10 23:17:00 -04:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-01-27 14:18:25 +01:00
2014-03-10 22:40:59 +01:00
2014-01-27 14:18:25 +01:00
2014-03-10 22:40:59 +01:00
2014-03-10 22:40:59 +01:00
2014-02-02 16:24:58 +01:00
2014-03-10 22:40:59 +01:00
2014-03-07 00:43:09 +05:30