]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/commitdiff
Merge branch 'master' into fancypodcast
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 27 Jun 2013 04:50:17 +0000 (00:50 -0400)
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Thu, 27 Jun 2013 04:50:17 +0000 (00:50 -0400)
1  2 
doc/style.css
templates/page.tmpl

diff --cc doc/style.css
Simple merge
Simple merge