aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-10-04 12:10:55 +0200
committerKim Alvefur <zash@zash.se>2017-10-04 12:10:55 +0200
commit2b7c24b6417aa509fb4f8360d503a24ad6cf5b46 (patch)
tree31071c1b069ed0de0094100b6522683ff05d0e54 /CHANGES
parentca622317f100d67023e2088179011eb61a243a2d (diff)
parent14d77f86bb64c5d535e5ac92f3b237eefcbd7a98 (diff)
downloadprosody-2b7c24b6417aa509fb4f8360d503a24ad6cf5b46.tar.gz
prosody-2b7c24b6417aa509fb4f8360d503a24ad6cf5b46.zip
Merge 0.10->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index 102415b7..8b9baa8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,10 +12,10 @@ New features
- mod\_pep\_plus
- Asynchronous operations
-0.10.not-released-yet
+0.10.0
=====================
-**YYYY-MM-DD**
+**2017-10-02**
New features
------------