response

[git.ikiwiki.info.git] / doc / plugins / po.mdwn

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 0f1d66d32adebeb728852ea13a13bef2f37b47d0..91273ba9810e1db4e2919aa84d29d12b636f88ea 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -315,3 +315,6 @@ underlay, and the underlays lack translation to a given language.
 >>>>>> although they do not in this case. I still need to have a deep
 >>>>>> look at the underlays-related code you added to `po.pm` a while
 >>>>>> ago. Stay tuned. --[[intrigeri]]
+
+>>>>>>> Fixed in my po branch, along with other related small bugs that
+>>>>>>> happen in the very same situation only. --[[intrigeri]]