]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
(no commit message)
[git.ikiwiki.info.git] / doc / bugs / crashes_in_the_python_proxy_even_if_disabled.mdwn
index 746a56f6f995ede49854767e771fc9e4d36f4b80..3d5b056188f366bef40e0bc3dceaf33174769af0 100644 (file)
@@ -70,3 +70,5 @@ error: ikiwiki failed
 > > > > (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]]