X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/02b76497a26fe1eeeb97f1c000c619fb2fa057a5..b32480f0:/CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index cdbc21da8..22d9a3660 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,17 @@
-ikiwiki (3.20171002) UNRELEASED; urgency=medium
+ikiwiki (3.20180106) UNRELEASED; urgency=medium
+
+  * core: Don't send relative redirect URLs when behind a reverse proxy
+  * mdwn: Enable fenced code blocks, PHP Markdown Extra-style definition
+    lists and GitHub-style extensions to HTML tag syntax when used with
+    Discount >= 2.2.0 (Closes: #888055)
+  * build: `set -e` before each `for` loop, so that errors are reliably
+    trapped
+  * build: Use if/then instead of `||` so that the `-e` flag works
+  * build: Ensure that pm_to_blib finishes before rewriting shebang lines
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 08 Jan 2018 10:51:10 +0000
+
+ikiwiki (3.20180105) upstream; urgency=medium
 
   * emailauth: Fix cookie problem when user is on https and the cgiurl
     uses http, by making the emailed login link use https.
@@ -11,9 +24,9 @@ ikiwiki (3.20171002) UNRELEASED; urgency=medium
   * Updated German basewiki and directives translation from
     Sebastian Kuhnert.
 
- -- Joey Hess <id@joeyh.name>  Mon, 25 Dec 2017 14:57:27 -0400
+ -- Joey Hess <id@joeyh.name>  Fri, 05 Jan 2018 13:41:20 -0400
 
-ikiwiki (3.20171001) unstable; urgency=medium
+ikiwiki (3.20171001) upstream; urgency=medium
 
   [ Joey Hess ]
   * htmlscrubber: Add support for the video tag's loop and muted