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
commit2f6cd743bbd3310bf886e9a895f88817cf7d6a98 (patch)
tree2e46ec0094c1f0330a69d7ab69c07753be981cfd
parent3990f293e219a92e5da856b8d17c53533227e088 (diff)
parent387a30a351fdb0efcebf20ec3a94379da11cd910 (diff)
downloadprosody-2f6cd743bbd3310bf886e9a895f88817cf7d6a98.tar.gz
prosody-2f6cd743bbd3310bf886e9a895f88817cf7d6a98.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)
-