diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2017-01-22 13:08:44 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2017-01-22 13:08:44 +0100 |
| commit | 7035f38e0be568e508a76dee1b791aeaa609305c (patch) | |
| tree | e32c6a927c7fe1215818ef034691953b9317e8cc | |
| parent | d53c813408a7db2efad5ada94fc08e940fe9f528 (diff) | |
| parent | 2f4eee1fa7985cfcde0d29336705d3978dedb778 (diff) | |
Merge branch 'master' of github.com:siacs/Conversations
| -rw-r--r-- | docs/XEPs.md | 1 |
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 |