aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-01-08 13:26:56 -0500
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2012-01-08 13:26:56 -0500
commit17d012593acf260ee72e6fa7026ac48894ecf6b7 (patch)
tree655a5b8d8c85d08d1e9217bd25f6c618264f5377 /doc/bugs
parent7745ff8fc7bb633e8ef1469749ece8f09010c776 (diff)
downloadikiwiki-17d012593acf260ee72e6fa7026ac48894ecf6b7.tar
ikiwiki-17d012593acf260ee72e6fa7026ac48894ecf6b7.tar.gz
repoint git branches and website
Diffstat (limited to 'doc/bugs')
-rw-r--r--doc/bugs/http_proxy_for_openid.mdwn6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index b7ae76aeb..566896ec3 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -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]]