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 | 83d80d03ff08842f1d36a38136ad778ba9ff3a25 (patch) | |
| tree | 6ddf6edc434992574acbd61b72b02e3fa584f7f8 | |
| parent | fb7cddd9e8207ca379f2cfe8f90a13a92f7cf39d (diff) | |
| parent | 2c45793d230c3adc5c3d0c955ad98e019fde98de (diff) | |
| download | prosody-83d80d03ff08842f1d36a38136ad778ba9ff3a25.tar.gz prosody-83d80d03ff08842f1d36a38136ad778ba9ff3a25.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 ------- |