X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/53a67d0503e505d7bc16d87a8f9517cfd7149d6b..9065e7ddfb985be179497ebb1f2206a332fd44d4:/CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index f2a2aaefb..9e595e5e9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,20 @@
-ikiwiki (3.20180106) UNRELEASED; urgency=medium
+ikiwiki (3.20180311) upstream; urgency=medium
+
+  [ Amitai Schleier ]
+  * Avoid unexpected full paths from find(1)
+
+  [ thm.id.fedoraproject.org ]
+  * rst test: Probe for docutils Python 3 module, not Python 2
+
+  [ Simon McVittie ]
+  * mdwn: Automatically detect which Discount flags to use, fixing
+    regressions in 3.20180228 when using Discount < 2.2
+  * 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>  Sun, 11 Mar 2018 15:53:34 +0000
+
+ikiwiki (3.20180228) upstream; urgency=medium
 
   * core: Don't send relative redirect URLs when behind a reverse proxy
   * core: Escape backticks etc. in directive error messages as HTML
@@ -19,7 +35,7 @@ ikiwiki (3.20180106) UNRELEASED; urgency=medium
   * debian: Remove unused Lintian overrides for duplicate word false positives
   * debian: Declare compliance with Debian Policy 4.1.3
 
- -- Simon McVittie <smcv@debian.org>  Mon, 08 Jan 2018 10:51:10 +0000
+ -- Simon McVittie <smcv@debian.org>  Wed, 28 Feb 2018 10:38:19 +0000
 
 ikiwiki (3.20180105) upstream; urgency=medium