Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Sat, 30 Jan 2016 14:18:42 +0100
changeset 7116 ecebc821225d
parent 7114 43328166dcf1 (current diff)
parent 7115 bd29742fa1ba (diff)
child 7119 ecba5fee4867
Merge 0.10->trunk
CHANGES file | annotate | diff | comparison | revisions 
--- 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
 -------
prosody