aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2022-03-19 11:47:30 +0000
committerMatthew Wild <mwild1@gmail.com>2022-03-19 11:47:30 +0000
commit3853a45426c3b87291f7871e88b5c92cbe117cc5 (patch)
tree0d0a61f750302f551f3cc339dc7718b755802819 /CHANGES
parentf56d92085929518296b5342b9483ccb9bb1cd0cf (diff)
parentdf4ba58b9f44799d8bba2e084ad2ad5696667cc2 (diff)
downloadprosody-3853a45426c3b87291f7871e88b5c92cbe117cc5.tar.gz
prosody-3853a45426c3b87291f7871e88b5c92cbe117cc5.zip
Merge 0.12->trunk
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES6
1 files changed, 4 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index a81873b0..d963f310 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
-TRUNK
-=====
+0.12.0
+======
+
+**2022-03-14**
## New