aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-23 19:34:14 +0100
committerKim Alvefur <zash@zash.se>2017-01-23 19:34:14 +0100
commitdb88e0f7b51eeaed68b9b50502b6ba82c53633a1 (patch)
treeea895b1073f2ff2de7a08fc01f12797ab58c7125 /CHANGES
parent26f2953106794bbdd23db98f69fb6e90a4b8e460 (diff)
parentffde63fe687f5ffecf5fdec28358d1774a8a7169 (diff)
downloadprosody-db88e0f7b51eeaed68b9b50502b6ba82c53633a1.tar.gz
prosody-db88e0f7b51eeaed68b9b50502b6ba82c53633a1.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index d9f9d334..102415b7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,7 @@ New features
- mod\_carbons (XEP-0280)
- Pluggable connection timeout handling
- mod\_websocket (RFC 7395)
+- mod\_mam (XEP-0313)
Removed
-------