aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2019-11-16 16:52:31 +0100
committerKim Alvefur <zash@zash.se>2019-11-16 16:52:31 +0100
commit612b1ffff129320130095099acc13b335aa14b9c (patch)
tree6e391ff6608608f181e42c92ee6dfd7c534da255 /CHANGES
parent6a2b94e8b8629d6571202a34b6ebbd4793fe4abe (diff)
parent70a81b5ffdb84e5dc082fee557dc9e3af237bc27 (diff)
downloadprosody-612b1ffff129320130095099acc13b335aa14b9c.tar.gz
prosody-612b1ffff129320130095099acc13b335aa14b9c.zip
Merge 0.11->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES16
1 files changed, 16 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 136b7d2b..e451d3f5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+TRUNK
+=====
+
+- Module statuses
+- SNI support (not completely finished)
+- CORS handling now provided by mod\_http
+- CSI improvements
+- mod\_limits: Exempted JIDs
+- Archive quotas
+- mod\_mimicking
+- Rewritten migrator
+- SCRAM-SHA-256
+- Bi-directional server-to-server (XEP-0288)
+- Built-in HTTP server now handles HEAD requests
+- MUC presence broadcast controls
+
0.11.0
======