Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / doc / bugs / svg_and_pdf_conversion_fails.mdwn

diff --git a/doc/bugs/svg_and_pdf_conversion_fails.mdwn b/doc/bugs/svg_and_pdf_conversion_fails.mdwn
index ac18fe8aa31c42cae33218b97d187d685d10a6f9..9910959f907580cce8d1fe18dd18321a1a5356eb 100644 (file)
--- a/doc/bugs/svg_and_pdf_conversion_fails.mdwn
+++ b/doc/bugs/svg_and_pdf_conversion_fails.mdwn
@@ -56,3 +56,5 @@ should be safe for inclusion.
 >>> which works, so my biggest fear about the all-to-png change is unwarranted.
 >>> i'll have a look at that some time, but i think as things are, this is
 >>> ready now, please review again. --[[chrysn]]
 >>> which works, so my biggest fear about the all-to-png change is unwarranted.
 >>> i'll have a look at that some time, but i think as things are, this is
 >>> ready now, please review again. --[[chrysn]]

+
+>>>> [[merged|done]] --[[smcv]]