diff options
| author | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-03-22 18:25:31 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2020-03-22 18:25:31 +0100 |
| commit | 30e4423934efdc71e64655eb4d90cd0b841fffd0 (patch) | |
| tree | b50b306a30b3df94d0f59a45955e2be7dab026ed | |
| parent | f9b453d8790c1c0c37151d2304c0ff94c8b1805a (diff) | |
| parent | 493055f2cb2c29f6d73b75ee2422a02308c8f401 (diff) | |
Merge branch 'master' of https://github.com/kriztan/Pix-Art-Messenger
| -rw-r--r-- | docs/encryption.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/encryption.md b/docs/encryption.md index edd7e6c5e..ee17352ee 100644 --- a/docs/encryption.md +++ b/docs/encryption.md @@ -4,7 +4,7 @@ Pix-Art Messenger will remove the implementation of OTR encryption by 30th June Unfortunately, it does not make sense to continue support on a rather out-dated technology, even as we see some users keep using it. For the moment, OTR (as well as OpenPGP) can be activated via the expert settings for advanced users. Pix-Art Messenger always tries to be usable for even [non-technical users](https://github.com/kriztan/Pix-Art-Messenger/issues/227), OTR however is not counted as appropriate for this. -Please consider to use OMEMO in the future, many other clients has implemented this, have a look at [omemo.top](https://omemo.top/). However, if you really need to continue using it, please refer to e.g. [Miranda](https://www.miranda-ng.org/de/), [Pidgin](https://pidgin.im/), [Profanity](https://profanity-im.github.io/). You are also able to fork Pix-Art Messenger and continue the implementation on your own. +Please consider to use OMEMO in the future, many other clients has implemented this, have a look at [omemo.top](https://omemo.top/). However, if you really need to continue using it, please refer to e.g. [Miranda](https://www.miranda-ng.org/de/), [Pidgin plugin](https://github.com/gkdr/lurch/), [Profanity](https://profanity-im.github.io/) or [Coy.im](https://coy.im/). You are also able to fork Pix-Art Messenger and continue the implementation on your own. Please consider the differences between encryption protocols and also advantages of OMEMO: |