fix conf timeout and patch geoloc binaries video editor

This commit is contained in:
aynsix
2020-05-20 17:06:29 +03:00
parent 2c387552fa
commit 7a3f74d256
5 changed files with 164 additions and 2 deletions

View File

@@ -17,7 +17,7 @@ class Version
* @var string
*/
private $number = '4.1.0-alpha.27a';
private $number = '4.1.0-alpha.28a';
/**
* @var string

View File

@@ -198,7 +198,7 @@ class Installer
$config['main']['database']['driver'] = 'pdo_mysql';
$config['main']['database']['charset'] = 'UTF8';
$config['main']['binaries'] = $binaryData;
$config['main']['binaries'] = array_merge($config['main']['binaries'], $binaryData);
$config['servername'] = $serverName;
$config['main']['key'] = $this->app['random.medium']->generateString(16);