diff options
| author | lupo49 <post@lupo49.de> | 2011-08-22 19:11:18 +0200 |
|---|---|---|
| committer | lupo49 <post@lupo49.de> | 2011-08-22 19:11:18 +0200 |
| commit | d8f231b5162801fe333f899552b5808a83282634 (patch) | |
| tree | f8021011b52502521eeff4f33e368628bb73ba89 /lib/tpl | |
| parent | 8e5a3957cd8de15f48dc27e9c07dfe4033fd6997 (diff) | |
| parent | 1c5f7481f4e685ad3ffe9ba48ed47ed75196e64a (diff) | |
| download | rpg-d8f231b5162801fe333f899552b5808a83282634.tar.gz rpg-d8f231b5162801fe333f899552b5808a83282634.tar.bz2 | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'lib/tpl')
| -rw-r--r-- | lib/tpl/default/images/apple-touch-icon.png | bin | 0 -> 17728 bytes | |||
| -rw-r--r-- | lib/tpl/default/main.php | 3 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/tpl/default/images/apple-touch-icon.png b/lib/tpl/default/images/apple-touch-icon.png Binary files differnew file mode 100644 index 000000000..45fa4e7b0 --- /dev/null +++ b/lib/tpl/default/images/apple-touch-icon.png diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 94c2322aa..26e84fde6 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -28,8 +28,7 @@ if (!defined('DOKU_INC')) die(); </title> <?php tpl_metaheaders()?> - - <link rel="shortcut icon" href="<?php echo tpl_getFavicon() ?>" /> + <?php echo tpl_favicon(array('favicon', 'mobile')) ?> <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> </head> |
