Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/doc/plugins/contrib/po.mdwn b/doc/plugins/contrib/po.mdwn
index 3077b485848118722d2514508703346364aaa966..0fd06cb81e799405b096f210d8f86dd7a6f4ec96 100644 (file)
--- a/doc/plugins/contrib/po.mdwn
+++ b/doc/plugins/contrib/po.mdwn
@@ -158,3 +158,5 @@ Any thoughts on this?
 >>>>> Joey, please have a look at my branch, your help would be really
 >>>>> welcome for the security research, as I'm almost done with what
 >>>>> I am able to do myself in this area. --[[intrigeri]]
+>>>>>>
+>>>>>> I came up with a patch for the WrapI18N issue --[[Joey]]