projects / prosody.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge 0.10->trunk
[prosody.git] / CHANGES
diff --git a/CHANGES b/CHANGES
index 3a32672850ee6db3dc024b68ee6e34d06a36719a..2e0e61a20d12396721023872cba910d804553a38 100644 (file)
--- 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
 -------