aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2018-04-04 18:42:32 +0100
committerMatthew Wild <mwild1@gmail.com>2018-04-04 18:42:32 +0100
commitb243e2fe18bd8d873f51c67397ccd2d2948be2aa (patch)
tree2e46ec0094c1f0330a69d7ab69c07753be981cfd
parentac665260b87e90bf6c5a0700b22db5a54701f9c6 (diff)
parentc18db64434156ea04bfba7eb2b6bf168992b0530 (diff)
downloadprosody-b243e2fe18bd8d873f51c67397ccd2d2948be2aa.tar.gz
prosody-b243e2fe18bd8d873f51c67397ccd2d2948be2aa.zip
Merge 0.10 -> trunk
-rw-r--r--CHANGES3
1 files changed, 1 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index b5be041b..4f0802bb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -15,7 +15,7 @@ New features
- Busted for tests
0.10.0
-=====================
+======
**2017-10-02**
@@ -39,4 +39,3 @@ Removed
- mod\_privacy (XEP-0016)
- mod\_compression (XEP-0138)
-