aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-11-25 13:31:40 +0100
committerKim Alvefur <zash@zash.se>2018-11-25 13:31:40 +0100
commit56227ef034709e59ffcd56470082c201ba731474 (patch)
tree07413213fa09876c6643f173b952382902f0aa36 /CHANGES
parent255d4ba139a93aecf66bb4a081f3aa45b6ac4e35 (diff)
parent38498588b43c93cbc2bc5de9f21cf8975b8169a1 (diff)
downloadprosody-56227ef034709e59ffcd56470082c201ba731474.tar.gz
prosody-56227ef034709e59ffcd56470082c201ba731474.zip
Merge 0.11->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES2
1 files changed, 1 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index a5c185cc..136b7d2b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
0.11.0
======
-**YYYY-MM-DD** (not yet)
+**2018-11-18**
New features
------------