Merge branch 'master' into debian-jessie-backports

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

diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 7bc56676ea46edf286ad1b17243f4b71d92b95de..d826546e68c809b01476d3d2d4e37605b1e2397c 100644 (file)
--- a/doc/bugs/po_vs_templates.mdwn
+++ b/doc/bugs/po_vs_templates.mdwn
@@ -40,4 +40,9 @@ This has been fixed in my po branch.
 >> your po branch and remove your other workarounds so I can merge?
 >> --[[Joey]]
 
 >> your po branch and remove your other workarounds so I can merge?
 >> --[[Joey]]
 

-[[!tag patch]]
+>>> I merged your filter-full branch into my po branch and reverted my
+>>> other workarounds. According to my tests this works ok. I'm glad
+>>> you found this solution, as I didn't like changing the filter
+>>> prototype. I believe you can now merge this code. --[[intrigeri]]
+
+[[!tag patch done]]