diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-11 17:28:34 +0200 |
| commit | 20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f (patch) | |
| tree | 258667acf6ea0c995b47195492d453c7459b31ca /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked | |
| parent | 92ac2ded10548756922a4c22ebae0a19b8862426 (diff) | |
| parent | 5c44f8400970de5943fd6c5e804dfa394f3deb01 (diff) | |
| download | open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.gz open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.tar.bz2 open-keychain-20a6c5ce8a0484cc0ef8f4c5ca1405f60e646e1f.zip | |
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
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/TwitterResource.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/TwitterResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/TwitterResource.java index d6b806ee6..73e3d3643 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/TwitterResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/TwitterResource.java @@ -32,10 +32,10 @@ import java.util.regex.Pattern; public class TwitterResource extends LinkedTokenResource { - public static final String[] CERT_PINS = new String[] { - // antec Class 3 Secure Server CA - G4 + public static final String[] CERT_PINS = null; /*(new String[] { + // Symantec Class 3 Secure Server CA - G4 "513fb9743870b73440418d30930699ff" - }; + };*/ final String mHandle; final String mTweetId; |