rename todo/merge_tincho-osm_branch.mdwn to todo/merge_tina-osm_branch.mdwn

[git.ikiwiki.info.git] / CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 220211966ff8c9940ed5f2be791855eef82bf888..9360a8f26de07f53ac442582367c5274929492ad 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,11 +1,17 @@
-ikiwiki (3.20190229) UNRELEASED; urgency=medium
+ikiwiki (3.20200202.3) upstream; urgency=medium

 
 

+  [ Amitai Schleier ]
+  * highlight: Adapt to API change in highlight >= 3.51
+  * mdwn: Fix inverted footnote configuration when MultiMarkdown is
+    enabled. Thanks, Giuseppe Bilotta
+
+  [ Joey Hess ]

   * Updated German basewiki and directives translation from
     Sebastian Kuhnert.
   * Updated German program translation from
     Sebastian Kuhnert.
 
   * Updated German basewiki and directives translation from
     Sebastian Kuhnert.
   * Updated German program translation from
     Sebastian Kuhnert.
 

- -- Joey Hess <id@joeyh.name>  Wed, 05 Jun 2019 12:08:46 -0400
+ -- Joey Hess <id@joeyh.name>  Sun, 02 Feb 2020 00:00:00 -0400

 
 ikiwiki (3.20190228) upstream; urgency=medium
 
 
 ikiwiki (3.20190228) upstream; urgency=medium