webui merge fix
1 parent b428783 commit fa61d445f267c5ed161c8e2f548f06ad81bf4219
@SJ SJ authored on 5 Apr 2013
Showing 7 changed files
View
webui/config.php
View
webui/controller/login/login.php
View
webui/view/theme/orig/stylesheet/style-orig.css
View
webui/view/theme/orig/templates/common/layout-audit.tpl
View
webui/view/theme/orig/templates/common/layout-email.tpl
View
webui/view/theme/orig/templates/common/layout-search.tpl
View
webui/view/theme/orig/templates/common/layout.tpl