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
commit5970fb161e2c811c59d0b0a512c8f8a756a7814a (patch)
tree31071c1b069ed0de0094100b6522683ff05d0e54 /CHANGES
parent753dbfaf91c8855555370310ecd1ac228b2ad6c8 (diff)
parent03d6a88e608e2027894172728921701f8987d9a8 (diff)
downloadprosody-5970fb161e2c811c59d0b0a512c8f8a756a7814a.tar.gz
prosody-5970fb161e2c811c59d0b0a512c8f8a756a7814a.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
------------