Commit 64604ded authored by Marius Cramer's avatar Marius Cramer
Browse files

Merge branch 'master' into 'master'

company name for login-page

See merge request !239
parents d925b32c 77f33e6c
......@@ -312,6 +312,7 @@ if($error != ''){
}
$app->load('getconf');
$sys_config = $app->getconf->get_global_config('misc');
$security_config = $app->getconf->get_security_config('permissions');
if($security_config['password_reset_allowed'] == 'yes') {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment