aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-01-19 17:15:57 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-01-19 17:15:57 +0100
commitea37fb9ffa87b66642f4d9ea00ca830f1826c31d (patch)
tree1dec69c436bd031de1e7a26fed75e919458b90ad /src/main/res/values/strings.xml
parent1e607d7b1b0accf03d0e170fe67d418dac7c2114 (diff)
parent503237087ffc5585876dfdb96ef167960bef0f15 (diff)
Merge pull request #904 from SamWhited/remove-ssl
Remove legacy SSL support
Diffstat (limited to 'src/main/res/values/strings.xml')
-rw-r--r--src/main/res/values/strings.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2dac29da..dc4c1bdb 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -269,8 +269,6 @@
<string name="pref_force_encryption_summary">Always send messages encrypted (except for conferences)</string>
<string name="pref_dont_save_encrypted">Don’t save encrypted messages</string>
<string name="pref_dont_save_encrypted_summary">Warning: This could lead to message loss</string>
- <string name="pref_enable_legacy_ssl">Enable legacy SSL</string>
- <string name="pref_enable_legacy_ssl_summary">Enables legacy SSLv3 support and insecure SSL ciphers.</string>
<string name="pref_expert_options">Expert options</string>
<string name="pref_expert_options_summary">Please be careful with these</string>
<string name="title_activity_about">About Conversations</string>