Merge branch 'release/3.0' into release/3.1

This commit is contained in:
Dylan K. Taylor 2018-07-17 16:56:57 +01:00
commit b7f15b6574

View File

@ -143,7 +143,6 @@ class Config{
$content = file_get_contents($this->file);
switch($this->type){
case Config::PROPERTIES:
case Config::CNF:
$this->parseProperties($content);
break;
case Config::JSON:
@ -194,7 +193,6 @@ class Config{
$content = null;
switch($this->type){
case Config::PROPERTIES:
case Config::CNF:
$content = $this->writeProperties();
break;
case Config::JSON: