Merge branch 'development' of github.com:siacs/Conversations into development

This commit is contained in:
iNPUTmice 2015-02-18 18:23:26 +01:00
commit 77a9ddb984

View file

@ -2,6 +2,7 @@
* XEP-0030: Service Discovery
* XEP-0045: Multi-User Chat
* XEP-0048: Bookmarks
* XEP-0092: Software Version
* XEP-0115: Entity Capabilities
* XEP-0163: Personal Eventing Protocol (avatars and nicks)
* XEP-0166: Jingle (only used for file transfer)