summaryrefslogtreecommitdiff
path: root/doc/todo
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-11-29 15:00:22 -0400
committerJoey Hess <joey@kitenet.net>2010-11-29 15:00:22 -0400
commit141dc37d361107a6607b3ff549f107c26fa700d4 (patch)
treef08a387cbd6bd0e4fb10789b93905a315948cb98 /doc/todo
parent53d466a07f542dca86732764ab4f13608d701a1c (diff)
merged localurl branch; changelog
Diffstat (limited to 'doc/todo')
-rw-r--r--doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
index 264eb9688..f7938b061 100644
--- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
+++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn
@@ -319,3 +319,5 @@ Potential future things:
>> core code (IkiWiki, CGI, Render and the pseudo-core part of editpage)
>> and 5 in plugins, since I used it for things like redirection back
>> to the top of the wiki --[[smcv]]
+
+[[merged|done]] --[[Joey]]