From: Joey Hess Date: Tue, 27 Oct 2009 06:13:16 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info X-Git-Tag: 3.20091031~20 X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/4ba54879eb27799945f5eaf2c83ad26271f6e5b0?hp=799fb15cfd8dcae62228018303a564999201a1fb Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info --- diff --git a/doc/soc/ideas.mdwn b/doc/soc/ideas.mdwn index 07c7e669e..88f06b0f1 100644 --- a/doc/soc/ideas.mdwn +++ b/doc/soc/ideas.mdwn @@ -6,4 +6,3 @@ but please don't add the `soc` tag yourself. [[!inline pages="(todo/* or bugs/*) and link(soc) and !todo/done and !link(todo/done) and !bugs/done and !link(bugs/done) and !*/Discussion" actions=yes show=0]] -[http://www.yaheodj.com/ khn] diff --git a/doc/todo/Gallery.mdwn b/doc/todo/Gallery.mdwn index 5018d85c4..f41980333 100644 --- a/doc/todo/Gallery.mdwn +++ b/doc/todo/Gallery.mdwn @@ -80,4 +80,4 @@ Additional details are available [here](http://myweb.unomaha.edu/~ajain/ikiwikig See also [[/users/smcv/gallery]] for another implementation of the same sort of thing. Unfortunately, none of the implementation ideas -I have there seem quite right either... --[[smcv]] [Lightbox](http://www.asererogether.com) +I have there seem quite right either... --[[smcv]]