aboutsummaryrefslogtreecommitdiff
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
commita2eea4957ca2086bcfb2b73c49ad9073162d6a97 (patch)
tree5a808a9a523c0a8ffdddb87e83ac0c4a79609f6b /CHANGES
parentd43238a86b32a24d427c2609bacd100b35895116 (diff)
parent51f1571a66ed90c1142e93cd882682f0345f9000 (diff)
downloadprosody-im-server-a2eea4957ca2086bcfb2b73c49ad9073162d6a97.tar
prosody-im-server-a2eea4957ca2086bcfb2b73c49ad9073162d6a97.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
------------