Merge branch 'master' of github.com:siacs/Conversations

Daniel Gultsch created 9 years ago

Change summary

docs/XEPs.md | 1 +
1 file changed, 1 insertion(+)

Detailed changes

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