Merge branch 'develop' of github.com:optiz0r/status-board into develop

2011-12-22 19:27:43 +00:00
parent 8c9896f9b9 769f0f53e8
commit 75476698e9
4 changed files with 108 additions and 94 deletions
--- a/source/webui/templates/index.tpl
+++ b/source/webui/templates/index.tpl
@@ -5,6 +5,7 @@
        <script lang="javascript">
        </script>
        <link rel="stylesheet" type="text/css" href="{$base_uri}styles/normal.css" />
+        	<link rel="shortcut icon" href="{$base_uri}images/favicon.ico" />
        
        <script type="text/javascript">
            var base_uri = "{$base_uri|escape:'quote'}";