Merge commit '9ebd6d6b0fee486e1cb935cc7b5376d27ca99fd4'

# Conflicts:
#	resources/vanilla
This commit is contained in:
Dylan K. Taylor 2020-05-18 10:48:58 +01:00
commit dec500bbdd

View File

@ -145,7 +145,6 @@ abstract class Timezone{
return trim($data);
}
// RHEL / CentOS
$data = @parse_ini_file('/etc/sysconfig/clock');
if($data !== false and isset($data['ZONE']) and is_string($data['ZONE'])){