aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-03-21 12:10:10 +0100
committerKim Alvefur <zash@zash.se>2016-03-21 12:10:10 +0100
commit0a88a8699681f8ebf26b2f86531328c583c97f7b (patch)
tree2e679732a508b7c0dd418991af1668aa4ac8c168
parent26c655de373d763cae36ccc30bd9af95b44a86a4 (diff)
downloadprosody-0a88a8699681f8ebf26b2f86531328c583c97f7b.tar.gz
prosody-0a88a8699681f8ebf26b2f86531328c583c97f7b.zip
CHANGES: Move async to trunk, it was dropped from 0.10
-rw-r--r--CHANGES2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 2e0e61a2..899716be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ New features
- Rewritten more extensible MUC module
- mod\_pep\_plus
+- Asynchronous operations
0.10.not-released-yet
=====================
@@ -25,7 +26,6 @@ New features
- Lua 5.2 support
- mod\_blocklist (XEP-0191)
- mod\_carbons (XEP-0280)
-- Asynchronous operations
- Pluggable connection timeout handling
- mod\_websocket (RFC 7395)