aboutsummaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-30 14:18:42 +0100
committerKim Alvefur <zash@zash.se>2016-01-30 14:18:42 +0100
commita81725f764e9fb73f50008e65b75cdfecbc6d0e3 (patch)
tree40a90443d09d782f1e7360060201cd138bd4bd52 /CHANGES
parentd9ea1730ed8f0e91fc94fa3d52a18d8434df988f (diff)
parent546c1a3b148e366b2b1434dccdf3a7d827156f8b (diff)
downloadprosody-im-server-a81725f764e9fb73f50008e65b75cdfecbc6d0e3.tar
prosody-im-server-a81725f764e9fb73f50008e65b75cdfecbc6d0e3.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 3a326728..2e0e61a2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,7 @@ New features
- mod\_carbons (XEP-0280)
- Asynchronous operations
- Pluggable connection timeout handling
+- mod\_websocket (RFC 7395)
Removed
-------