Merge branch 'develop' into 1.5

# Conflicts:
#	CHANGELOG.md
#	system/defines.php
This commit is contained in:
Matias Griese
2018-07-19 10:05:26 +03:00

View File

@@ -60,6 +60,7 @@ class Debugger
if ($this->enabled()) {
$this->debugbar->addCollector(new ConfigCollector((array)$this->config->get('system'), 'Config'));
$this->debugbar->addCollector(new ConfigCollector((array)$this->config->get('plugins'), 'Plugins'));
$this->addMessage('Grav v' . GRAV_VERSION);
}
return $this;