aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-01-22 10:41:45 +0100
committerGitHub <noreply@github.com>2017-01-22 10:41:45 +0100
commit2f4eee1fa7985cfcde0d29336705d3978dedb778 (patch)
tree018becce5c4eec4a8d214ad9bff5ca2d55fbceb8
parent97ba0a0d49dbd3eafb8b7db07a636e107400332d (diff)
parent313baca84ea6a630d479424d3052011a8f17ae7f (diff)
Merge pull request #2230 from AnBuKu/patch-1
Added XEP-0384
-rw-r--r--docs/XEPs.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/XEPs.md b/docs/XEPs.md
index f88686e9..eab494fc 100644
--- a/docs/XEPs.md
+++ b/docs/XEPs.md
@@ -29,3 +29,4 @@
* XEP-0363: HTTP File Upload
* XEP-0368: SRV records for XMPP over TLS
* XEP-0377: Spam Reporting
+* XEP-0384: OMEMO Encryption