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

This commit is contained in:
Daniel Gultsch 2017-01-22 13:08:44 +01:00
commit 7035f38e0b
1 changed files with 1 additions and 0 deletions

View File

@ -29,3 +29,4 @@
* XEP-0363: HTTP File Upload * XEP-0363: HTTP File Upload
* XEP-0368: SRV records for XMPP over TLS * XEP-0368: SRV records for XMPP over TLS
* XEP-0377: Spam Reporting * XEP-0377: Spam Reporting
* XEP-0384: OMEMO Encryption