summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-07-11 11:27:54 +0200
committerintrigeri <intrigeri@boum.org>2010-07-11 11:27:54 +0200
commitea3926bd87c227ed654dc868e8e027029baed413 (patch)
tree9343988faaaee75f6648776d4e69d53641a222e5 /doc
parent1bb9157f2ab94b8306e1e2fb1a5b3ac9bbfe5772 (diff)
the filter-full branch works nicely
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/po_vs_templates.mdwn5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/bugs/po_vs_templates.mdwn b/doc/bugs/po_vs_templates.mdwn
index 7bc56676e..9fd0de694 100644
--- 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]]
+>>> 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]]