aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-13 18:30:18 +0100
committerKim Alvefur <zash@zash.se>2017-01-13 18:30:18 +0100
commit26f2953106794bbdd23db98f69fb6e90a4b8e460 (patch)
tree5dfa49570563bb3738e7038af9b419106296a627 /CHANGES
parentc3d9a2c11d362fcd1677d169af395c1f7bb8d4f1 (diff)
parent4d644d2c03246c3dcb2937475965e7f849a053b4 (diff)
downloadprosody-26f2953106794bbdd23db98f69fb6e90a4b8e460.tar.gz
prosody-26f2953106794bbdd23db98f69fb6e90a4b8e460.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 499f36dd..d9f9d334 100644
--- a/CHANGES
+++ b/CHANGES
@@ -35,4 +35,5 @@ Removed
-------
- mod\_privacy (XEP-0016)
+- mod\_compression (XEP-0138)