aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-01-29 09:21:57 +0000
committerGitHub <noreply@github.com>2019-01-29 09:21:57 +0000
commitab757f6a3cd23af58ba1659eddac3ea6ed23112e (patch)
treea06a4558312a257b7d57d5b441238a58c8504e0b
parentf26edd53ff81b21530d06e687ae223e15a015d79 (diff)
parentda628e0accb368f0e7cd9132e6830598c55e9e20 (diff)
downloadpurple-matrix-ab757f6a3cd23af58ba1659eddac3ea6ed23112e.tar.gz
Merge pull request #90 from aaronraimist/patch-1
Make it clear that decryption is supported
-rw-r--r--README.md3
1 files changed, 3 insertions, 0 deletions
diff --git a/README.md b/README.md
index 00d6821..e8e5953 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,10 @@ The following are not yet supported:
* Account registration
* Room topics
* Voice/video calling
+
+The following are in progress:
* End-To-End encryption via Olm ([ticket](https://github.com/matrix-org/purple-matrix/issues/18))
+ * [Decyption is supported but not encryption](https://github.com/matrix-org/purple-matrix/issues/18#issuecomment-410336278)
The plugin requires a matrix homeserver supporting client-server API r0.0.0 Synapse
v0.12.0-rc1 or later is sufficient.