Merge branch 'master' into mcpe-0.11

This commit is contained in:
Shoghi Cervantes 2015-03-22 02:20:32 +01:00
commit 93a50d08e7
No known key found for this signature in database
GPG Key ID: 78464DB0A7837F89

View File

@ -84,6 +84,7 @@ class Config{
$this->config = [];
$this->correct = false;
$this->load($this->file);
$this->load($this->file, $this->type);
}
/**