diff options
| author | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-06 19:42:55 +0100 |
| commit | 3c400703e082a1b180b35d891b8fb3460c7d5b87 (patch) | |
| tree | 28738dd90fc41b4ab71897f38d324828778ad2e3 /docs/XEPs.md | |
| parent | 72114d732427266024cdd6e27cd8d1aa60afae2f (diff) | |
| parent | f28d77dc42f6bac5a026e0b1c78562dee8de45ac (diff) | |
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'docs/XEPs.md')
| -rw-r--r-- | docs/XEPs.md | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/XEPs.md b/docs/XEPs.md index 1b9ea6af..873ea998 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 |