X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d58b25eb93beb84b30475546804066a15578d115..6a026338bbb728f7fc3dda16ba0fe9c9b4255514:/CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 747058ff6..cf4f451be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,15 @@
-ikiwiki (3.20180229) UNRELEASED; urgency=medium
+ikiwiki (3.20180312) UNRELEASED; urgency=medium
+
+  [ Amitai Schleier ]
+  * emailauth: When email can't be sent, show the error message
+  * osm: Don't raise errors if tags don't have attached icons
+
+  [ Simon McVittie ]
+  * Hide popup template content from documentation (Closes: #898836)
+
+ -- Simon McVittie <smcv@debian.org>  Wed, 16 May 2018 13:09:27 +0100
+
+ikiwiki (3.20180311) upstream; urgency=medium
 
   [ Amitai Schleier ]
   * Avoid unexpected full paths from find(1)
@@ -12,7 +23,7 @@ ikiwiki (3.20180229) UNRELEASED; urgency=medium
   * Add a test asserting that no plugin is an empty file, to confirm
     that the build fixes in 3.20180228 were successful
 
- -- Simon McVittie <smcv@debian.org>  Fri, 09 Mar 2018 09:15:14 +0000
+ -- Simon McVittie <smcv@debian.org>  Sun, 11 Mar 2018 15:53:34 +0000
 
 ikiwiki (3.20180228) upstream; urgency=medium