X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/9c23006d31c5a70e5f8b60477862eb0b04281db6..d8f12120d15cdbe22507842f0aba04ead294bcba:/CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 9e595e5e9..cf4f451be 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+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 ]