X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/17d012593acf260ee72e6fa7026ac48894ecf6b7..cc5ad8efcd9378b114a51511b548779b2000e50d:/doc/bugs/http_proxy_for_openid.mdwn diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn index 566896ec3..4a9c1b3eb 100644 --- a/doc/bugs/http_proxy_for_openid.mdwn +++ b/doc/bugs/http_proxy_for_openid.mdwn @@ -79,8 +79,7 @@ Brian May >>>>> installed, even with the above commit, `openid` won't be able to >>>>> traverse a proxy. --[[schmonz]] -[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]] +[[!template id=gitbranch branch=schmonz/proxy author="[[schmonz]]"]] ->>>>> I bollixed up my git, recloned, and reapplied the diffs, so ->>>>> that commit won't exist anymore. My proxy-related changes are ->>>>> now on a branch. --[[schmonz]] +>>>>>> I've redone this from scratch, much more simply, on a new +>>>>>> branch. --[[schmonz]].