From: Anders Kaseorg Date: Fri, 31 Jan 2014 05:19:59 +0000 (-0500) Subject: Merge commit 'baaa848f6c06b0b3a59677d3551e130c65e5fde7' into sipb X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c?hp=--cc Merge commit 'baaa848f6c06b0b3a59677d3551e130c65e5fde7' into sipb Conflicts: templates/page.tmpl --- 8e072cf1b075389b0bcf9e94e3ce3cf97ef48d5c diff --cc templates/page.tmpl index d4d681084,7e850a56b..0597b04f7 --- a/templates/page.tmpl +++ b/templates/page.tmpl @@@ -1,15 -1,19 +1,16 @@@ - + + <TMPL_VAR TITLE> - - - - - - - - - + + + + + +