diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-05-05 12:58:27 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-05-05 12:58:27 +0200 |
| commit | 99e8fc0ad67bf7ff14f53fd141fe57b96a107648 (patch) | |
| tree | 78b07eaa7fdc9bde1bf2ecd11e65f22afdcc8944 /app/layout/layout.phtml | |
| parent | 23dd73ddeec2473c3e8a3c517317e074ac53a1d8 (diff) | |
| parent | 22e9fb02f838e2b6ac8c5dd504fad0446c5807dc (diff) | |
Merge branch 'dev' into releases
Diffstat (limited to 'app/layout/layout.phtml')
| -rw-r--r-- | app/layout/layout.phtml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index a515217d6..331570873 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -3,6 +3,9 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="initial-scale=1.0"> + <link rel="icon" type="image/x-icon" href="<?php echo Url::display ('/favicon.ico'); ?>" /> + <link rel="icon" type="image/png" href="<?php echo Url::display ('/favicon.ico'); ?>" /> + <?php echo self::headTitle (); ?> <?php echo self::headStyle (); ?> <?php echo self::headScript (); ?> |