aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-10-28 17:17:07 +0100
committerKim Alvefur <zash@zash.se>2018-10-28 17:17:07 +0100
commit9d6cefcaeb41c6a4257a103c3f1745a7d1b10397 (patch)
treeaf3096423457e1ae0c3f73a919723bb0a21d3f5e /CHANGES
parent3899c7ac4b50242ccfc78edc6d5e3d6c3b954008 (diff)
parent38d8451b2955824f89722ef72a6ea147ee9e3f9a (diff)
downloadprosody-9d6cefcaeb41c6a4257a103c3f1745a7d1b10397.tar.gz
prosody-9d6cefcaeb41c6a4257a103c3f1745a7d1b10397.zip
Merge 0.11->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES6
1 files changed, 3 insertions, 3 deletions
diff --git a/CHANGES b/CHANGES
index baab640b..d43d316f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,7 @@
-trunk
-=====
+0.11.0
+======
-**YYYY-MM-DD**
+**YYYY-MM-DD** (not yet)
New features
------------