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

Conflicts: source/webui/templates/index.tpl
2011-12-19 15:16:47 +00:00
parent a850ed911d 3972122249
commit d782249388
3 changed files with 10 additions and 14 deletions
--- a/source/webui/templates/index.tpl
+++ b/source/webui/templates/index.tpl
@@ -22,7 +22,7 @@
        <script type="text/javascript" src="{$base_uri}scripts/3rdparty/less-1.1.5.min.js"></script>
        <script type="text/javascript" src="{$base_uri}scripts/3rdparty/bootstrap-alerts.js"></script>
    </head>
-    <body>
+    <body>I can

 		<div class="topbar">
       		<div class="topbar-inner">