X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Ftodo%2Fuse_secure_cookies_for_ssl_logins.mdwn;h=194db2f36c2392bb23b8fab782580159da617609;hb=56b896f83549dd05fa8a440d72f99ece24d7b536;hp=f72b2d2d5df11f840c3398e469af3955d874e268;hpb=3697a684df0f9bf931fafb3cd7766753b47c1970;p=ikiwiki.git

diff --git a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
index f72b2d2d5..194db2f36 100644
--- a/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
+++ b/doc/todo/use_secure_cookies_for_ssl_logins.mdwn
@@ -32,3 +32,5 @@ get a secure session cookie, but if you log in over HTTP, you won't.
 > first, so that dual https/http sites can better be set up. --[[Joey]]
 
 >> Thanks for merging that! :-) --s
+
+[[merged|done]] --[[Joey]]