diff options
| author | Kim Alvefur <zash@zash.se> | 2016-01-30 14:18:42 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-01-30 14:18:42 +0100 |
| commit | bebb4e7b675a3db13263c1946c16b090bcf8f4f5 (patch) | |
| tree | 6ddf6edc434992574acbd61b72b02e3fa584f7f8 | |
| parent | 96dfcaadda01d04a2c3e097b7f84f4ad4b1130d8 (diff) | |
| parent | acacec8e82b6228d95a715750f68ea9c4cbeeaab (diff) | |
| download | prosody-bebb4e7b675a3db13263c1946c16b090bcf8f4f5.tar.gz prosody-bebb4e7b675a3db13263c1946c16b090bcf8f4f5.zip | |
Merge 0.10->trunk
| -rw-r--r-- | CHANGES | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -27,6 +27,7 @@ New features - mod\_carbons (XEP-0280) - Asynchronous operations - Pluggable connection timeout handling +- mod\_websocket (RFC 7395) Removed ------- |