From: Simon McVittie <smcv@debian.org>
Date: Wed, 16 May 2018 12:12:20 +0000 (+0100)
Subject: Update changelog
X-Git-Tag: 3.20190207~148
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/629b32dfc17a732f2bfd9a42fd07f1b087d99485

Update 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 ]