aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-02-25 00:16:14 -0400
committerJoey Hess <joey@kitenet.net>2014-02-25 00:16:14 -0400
commit9a1c60c9c63eafe11b9e6d14329c76e97d2c9f11 (patch)
treed865bc59114fe790a3c8651a3a3814efa9621068 /doc/bugs
parentbc94b6a76ebd07d64bac78776b7d10d6e1265a28 (diff)
downloadikiwiki-9a1c60c9c63eafe11b9e6d14329c76e97d2c9f11.tar
ikiwiki-9a1c60c9c63eafe11b9e6d14329c76e97d2c9f11.tar.gz
python proxy: Avoid utf-8 related crash. Thanks, Antoine Beaupré
Diffstat (limited to 'doc/bugs')
-rw-r--r--doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn2
1 files changed, 2 insertions, 0 deletions
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 746a56f6f..3d5b05618 100644
--- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
+++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
@@ -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]]