Merge origin/ci into ci

Conflicts:
	application/config/config.php
	tests/codeception/_data/dump.sql
	tests/codeception/api/v1/PersonCept.php
This commit is contained in:
paolo
2016-04-27 12:06:59 +02:00
4 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -514,4 +514,4 @@ spl_autoload_register(function ($class) {
if (substr($class,0,3) !== 'CI_' && substr($class,0,4) !== 'FHC_')
if (file_exists($file = APPPATH . 'core/' . $class . '.php'))
require_once $file;
});
});