aboutsummaryrefslogtreecommitdiffstats
path: root/docs/XEPs.md
diff options
context:
space:
mode:
authorChristian S <christian@pix-art.de>2016-02-20 15:28:01 +0100
committerChristian S <christian@pix-art.de>2016-02-20 15:28:01 +0100
commitfe52f30c5bbd6f4403b1fe97964488611a3c7276 (patch)
tree562388d395f2547b85c49d8979dbab6193d08199 /docs/XEPs.md
parent2879ddadca409d05eb71ca0863980ed0ec6b1023 (diff)
parent3bde4dbedb80a8e1de89c09f58d842d7382598e8 (diff)
Merge branch 'siacs/master' into development
Diffstat (limited to 'docs/XEPs.md')
-rw-r--r--docs/XEPs.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/XEPs.md b/docs/XEPs.md
index 1b9ea6afb..873ea998c 100644
--- a/docs/XEPs.md
+++ b/docs/XEPs.md
@@ -8,6 +8,7 @@
* XEP-0163: Personal Eventing Protocol (avatars and nicks)
* XEP-0166: Jingle (only used for file transfer)
* XEP-0184: Message Delivery Receipts (reply only)
+* XEP-0191: Blocking command
* XEP-0198: Stream Management
* XEP-0234: Jingle File Transfer
* XEP-0237: Roster Versioning
@@ -16,7 +17,10 @@
* XEP-0260: Jingle SOCKS5 Bytestreams Transport Method
* XEP-0261: Jingle In-Band Bytestreams Transport Method
* XEP-0280: Message Carbons
+* XEP-0308: Last Message Correction
* XEP-0313: Message Archive Management
* XEP-0333: Chat Markers
* XEP-0352: Client State Indication
-* XEP-0191: Blocking command
+* XEP-0357: Push Notifications
+* XEP-0363: HTTP File Upload
+* XEP-0368: SRV records for XMPP over TLS