Merge branch 'master' into renegade/general-fixes
This commit is contained in:
@@ -30,6 +30,5 @@ function getDbInstance() {
|
||||
'password' => DATABASE_PASSWORD,
|
||||
'db'=> DATABASE_NAME,
|
||||
'port' => DATABASE_PORT,
|
||||
'prefix' => DATABASE_PREFIX,
|
||||
'charset' => DATABASE_CHARSET));
|
||||
}
|
||||
|
||||
@@ -33,4 +33,4 @@ if(is_string($docker_cid)) {
|
||||
|--------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
?>
|
||||
?>
|
||||
|
||||
Reference in New Issue
Block a user