sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #176 from imaginator/patch-1 

small typo
This commit is contained in:
Daniel Gultsch 2014-06-03 15:11:38 +02:00
parent 99793fa909 f7bf62171f
commit 41dde747c2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -90,7 +90,7 @@ not supported for simplicity reasons. Users tend to forget their status, other
users ignore them and setting the status automatically would mean too much of an users ignore them and setting the status automatically would mean too much of an
impact on privacy. impact on privacy.
###Security ###Security
####Why are there to end-to-end encryption methods and which one should I choose? ####Why are there two end-to-end encryption methods and which one should I choose?
In most cases OTR should be the encryption method of choice. It works out of the box with most contacts as long as they are online. In most cases OTR should be the encryption method of choice. It works out of the box with most contacts as long as they are online.
However PGP can be in some cases (carbonated messages to multiple clients) be However PGP can be in some cases (carbonated messages to multiple clients) be
more flexible. more flexible.