diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2014-06-03 15:11:38 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2014-06-03 15:11:38 +0200 |
| commit | 41dde747c2b9cfe24469dee3ce888cfe20071476 (patch) | |
| tree | c4e2e1d36802f8718fdb1f172e0abaf25a992671 | |
| parent | 99793fa909f1d754d5dc0d7cb4d36ba289ac92e3 (diff) | |
| parent | f7bf62171f102b46f8f844048c3d409392d18a49 (diff) | |
Merge pull request #176 from imaginator/patch-1
small typo
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 impact on privacy. ###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. However PGP can be in some cases (carbonated messages to multiple clients) be more flexible. |