webui merge fix

This commit is contained in:
SJ
2013-04-05 11:16:07 +02:00
parent b428783ce9
commit fa61d445f2
7 changed files with 17 additions and 22 deletions

View File

@ -21,6 +21,9 @@ $config['SITE_URL'] = 'http://piler.yourdomain.com/';
$config['TIMEZONE'] = 'Europe/Budapest';
$config['PROVIDED_BY'] = 'www.mailpiler.org';
$config['SITE_KEYWORDS'] = 'piler email archiver';
$config['SITE_DESCRIPTION'] = 'piler email archiver';
// authentication against an ldap directory (disabled by default)
@ -61,7 +64,6 @@ $config['GOOGLE_CLIENT_SECRET'] = 'xxxxxxxxxxxxx';
$config['GOOGLE_DEVELOPER_KEY'] = 'xxxxxxxxxxxx';
$config['GOOGLE_APPLICATION_NAME'] = 'piler enterprise email archiver';
$config['PROVIDED_BY'] = 'Provided by piler';
$config['SITE_LOGO_LG'] = 'view/theme/default/assets/images/archive-logo-lg.png';
$config['SITE_LOGO_SM'] = 'view/theme/default/assets/images/archive-logo-sm.png';
$config['COMPATIBILITY'] = 'Which browsers are supported, etc';