aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2018-10-28 01:40:52 +0200
committerKim Alvefur <zash@zash.se>2018-10-28 01:40:52 +0200
commit0fb09c9328c33908898b2db5050a60d6ee595b11 (patch)
tree7cbb4c9dd5dafd67cac34c101b84d381bd1f54fd
parent083367fa306d91d370cb8a6be209e729feb2e186 (diff)
downloadprosody-0fb09c9328c33908898b2db5050a60d6ee595b11.tar.gz
prosody-0fb09c9328c33908898b2db5050a60d6ee595b11.zip
CHANGES: Update with new branch
-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
------------