diff options
| author | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
|---|---|---|
| committer | Adrian Lang <mail@adrianlang.de> | 2011-04-22 22:35:43 +0200 |
| commit | 8ccf9c9785ec2b626bad30a88a21f02886845418 (patch) | |
| tree | 0ecd6103880e3350bd37ba11ae3872805ede1755 /lib/tpl/default/main.php | |
| parent | e2092379b1c3200832cb569781ec647db5aeef0f (diff) | |
| parent | 23d27376b2a2f6a1ccf0777c48435717494d85b1 (diff) | |
| download | rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.gz rpg-8ccf9c9785ec2b626bad30a88a21f02886845418.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
data/deleted.files
doku.php
lib/exe/xmlrpc.php
Diffstat (limited to 'lib/tpl/default/main.php')
| -rw-r--r-- | lib/tpl/default/main.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index d9231678b..94c2322aa 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -29,7 +29,7 @@ if (!defined('DOKU_INC')) die(); <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" /> + <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> </head> @@ -92,7 +92,7 @@ if (!defined('DOKU_INC')) die(); <!-- wikipage stop --> </div> - <div class="clearer"> </div> + <div class="clearer"></div> <?php tpl_flush()?> |