X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c4cb6e3c346199929b42ab0c352e33b36f55b72e..e5fd29803493b875015fe6366cc430f171ddc898:/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn

diff --git a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
index 6fc1bf585..5c1e7b2ed 100644
--- a/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
+++ b/doc/bugs/do_not_let_big_brother_spy_on_our_users_on_login.mdwn
@@ -58,6 +58,8 @@ A simple fix would be to ship those icons with ikiwiki and serve them locally, b
 >>> drew my own for the rest.
 >>> [See it in use here](http://blueview.hosted.pseudorandom.co.uk/ikiwiki.cgi?do=prefs)
 >>> -s
+>>>>
+>>>> Awesome work Simon! I owe you a beer. [[merged|done]] --[[Joey]] 
 >>
 >> If people want the "real" logos, we could have some code to make IkiWiki
 >> download the favicons into transient underlay (which I think is