diff options
author | Jonas Smedegaard <dr@jones.dk> | 2013-10-12 14:27:32 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2013-10-12 14:27:32 +0200 |
commit | ccc9866cc6e4f35386a654d5eb66a71029b238b6 (patch) | |
tree | 571738ace013fd5dadd3e6377f4fca4cf93c1590 /page.tmpl | |
parent | 0e6ff999a3e1d255bf4f88c61ffa96e54452f512 (diff) | |
parent | 0e1bb78e6e1d3a6c587673a1d2d07bca2f8e4422 (diff) |
Merge branches 'da' and 'h1title' into h1title-da
Conflicts (resolved manually):
autotag.tmpl
Diffstat (limited to 'page.tmpl')
-rw-r--r-- | page.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -135,6 +135,7 @@ <div id="pagebody"> <TMPL_IF HTML5><section id="content"><TMPL_ELSE><div id="content"></TMPL_IF> +<h1><TMPL_VAR TITLE></h1> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> |