From 5b3c29178704c047d4020df2ae445ff01c6e1f3a Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 22 Jun 2015 08:48:27 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/themes/default/templates/main.tpl.htm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index eea836c..c69b79d 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -3,7 +3,7 @@
 <head>
   <meta charset='utf-8' />
 
-  <title><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
+  <title><tmpl_var name="company_name"><tmpl_var name="app_title"> <tmpl_var name="app_version"></title>
 
   <meta name='viewport' content='width=device-width, user-scalable=yes'>
   <meta name='description' lang='en' content='' />
@@ -122,4 +122,4 @@
   </script>
 </body>
 
-</html>
\ No newline at end of file
+</html>

--
Gitblit v1.9.1