cthrace/open-keychain
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v3.2.1' into linked-identities

Browse Source 
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
This commit is contained in:
Vincent Breitmoser committed 2015-05-11 17:28:34 +02:00
2 parents 92ac2ded10 5c44f84009
commit 20a6c5ce8a
104 files changed
+1597 -1339
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/linked/resources/TwitterResource.java
+3 -3
View File
@@ -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;