Update changelog and close bug

diff --git a/debian/changelog b/debian/changelog
index f8ee1827d3105a39309ff7120dc447c75ce72f51..eb2b2cefbf396adc78f16cc6ce4c2e32f9195eec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ ikiwiki (3.20170623) UNRELEASED; urgency=medium
   [ Simon McVittie ]
   * core: Don't decode the result of strftime if it is already tagged as
     UTF-8, as it might be since Perl >= 5.21.1. (Closes: #869240)
+  * Strip metadata from resized images when the deterministic config
+    option is set. Thanks, intrigeri
 
   [ Amitai Schleier ]
   * Fix the build with po4a 0.52

diff --git a/doc/bugs/images_resizing_is_not_deterministic.mdwn b/doc/bugs/images_resizing_is_not_deterministic.mdwn
index d17679eaad239df91fd5ae36501276321ff6f41b..1f964f4bfbde2ef85dd905cb4b2c24511af94863 100644 (file)
--- a/doc/bugs/images_resizing_is_not_deterministic.mdwn
+++ b/doc/bugs/images_resizing_is_not_deterministic.mdwn
@@ -11,4 +11,6 @@ succeeds with the branch merged).
 
 --[[intrigeri]]
 
+> Thanks, [[merged|done]] --[[smcv]]
+
 [[!tag patch]]