]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - doc/bugs/http_proxy_for_openid.mdwn
Merge branch 'master' of ssh://git.ikiwiki.info
[git.ikiwiki.info.git] / doc / bugs / http_proxy_for_openid.mdwn
index b7ae76aeb30ac1a4697d976719d16d3986da9639..566896ec328de870f4b698a4c55669f3aec7c8f0 100644 (file)
@@ -78,3 +78,9 @@ Brian May
 >>>>> explicitly removed", so if ikiwiki can preferentially find that 
 >>>>> installed, even with the above commit, `openid` won't be able to 
 >>>>> traverse a proxy. --[[schmonz]]
+
+[[!template id=gitbranch branch=schmonz/proxies 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]]