Mercurial > prosody-hg

changeset 7113:ecebc821225d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 30 Jan 2016 14:18:42 +0100
parents 43328166dcf1 (current diff) bd29742fa1ba (diff)
children ecba5fee4867
files CHANGES
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Thu Jan 28 14:17:45 2016 +0100
+++ b/CHANGES	Sat Jan 30 14:18:42 2016 +0100
@@ -27,6 +27,7 @@
 -   mod\_carbons (XEP-0280)
 -   Asynchronous operations
 -   Pluggable connection timeout handling
+-   mod\_websocket (RFC 7395)
 
 Removed
 -------