Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 13 Jan 2017 18:30:18 +0100
changeset 7825 4caaa0c185f1
parent 7823 8a9942086068 (current diff)
parent 7824 0dea440bdd46 (diff)
child 7860 db48b1697234
Merge 0.10->trunk
CHANGES
--- a/CHANGES	Mon Jan 09 10:17:39 2017 +0100
+++ b/CHANGES	Fri Jan 13 18:30:18 2017 +0100
@@ -35,4 +35,5 @@
 -------
 
 -   mod\_privacy (XEP-0016)
+-   mod\_compression (XEP-0138)