Merge branch 'ready/templatebody'

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index b50b515b0d0fc3cc83f1694d83695d8a423febe7..4356a7aedec70d2c919296bcd66d25b839c3368d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,9 @@ ikiwiki (3.20140912) UNRELEASED; urgency=medium
     before executing Perl code, so that PERL5LIB can point to a
     non-system-wide installation of IkiWiki.
     Thanks, Lafayette Chamber Singers Webmaster
+  * filecheck: accept MIME types not containing ';'
+  * autoindex: index files in underlays if the resulting pages aren't
+    going to be committed. Closes: #611068
 
  -- Simon McVittie <smcv@debian.org>  Fri, 12 Sep 2014 21:23:58 +0100