Rebuild for jessie-backports

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

diff --git a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
index bbaa53658f1b534e8b7123ce9d900b6d9f8c38cb..3d5b056188f366bef40e0bc3dceaf33174769af0 100644 (file)
--- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
+++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
@@ -65,3 +65,10 @@ error: ikiwiki failed
 > > > Right, I know that. The trick is to find the rabbit hole. :P
 > > > 
 > > > And I found it. With my dev/proxy-utf8-fail, this doesn't fail anymore. Yay, a [[patch]] ready for commit! --[[anarcat]]
+
+> > > > I don't see that branch in your git repo, could you repost it please?
+> > > > (I'm trying to review some of the pending patches.) --[[smcv]]
+
+>>>>> Ooops.. I forgot to push the branch, it should be good now! --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]]