aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-10-30 13:59:53 +0000
committerMatthew Wild <mwild1@gmail.com>2018-10-30 13:59:53 +0000
commit995bf1ad5c115daf0ca385a4860125bfe442c3a6 (patch)
treec00130e8d15d1b0e10aa5fbf2f3a1c729656f219 /CHANGES
parentfb768f193f73d360a61758b5a46e14d81c967151 (diff)
parent0ec2f1debd094977213c4fdb3f1cd75b3402176b (diff)
downloadprosody-995bf1ad5c115daf0ca385a4860125bfe442c3a6.tar.gz
prosody-995bf1ad5c115daf0ca385a4860125bfe442c3a6.zip
Merge 0.11->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index d43d316f..a5c185cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -22,6 +22,7 @@ New features
- mod\_muc\_mam (XEP-0313 in groupchats)
- mod\_vcard\_legacy (XEP-0398)
- mod\_vcard4 (XEP-0292)
+- mod\_csi, mod\_csi\_simple (XEP-0352)
- New experimental network backend "epoll"
0.10.0