Merge branch 'main' into testing
This commit is contained in:
commit
069eb7ce93
|
@ -24,6 +24,7 @@ $CONFIG = array (
|
||||||
'config_is_read_only' => true,
|
'config_is_read_only' => true,
|
||||||
'csrf.disabled' => true,
|
'csrf.disabled' => true,
|
||||||
'datadirectory' => '/var/www/html/data',
|
'datadirectory' => '/var/www/html/data',
|
||||||
|
'davstorage.request_timeout' => 86401,
|
||||||
'dbhost' => '<%= @dbhost %>',
|
'dbhost' => '<%= @dbhost %>',
|
||||||
'dbname' => '<%= @dbname %>',
|
'dbname' => '<%= @dbname %>',
|
||||||
'dbpassword' => '<%= @mysql_user_password %>',
|
'dbpassword' => '<%= @mysql_user_password %>',
|
||||||
|
|
Loading…
Reference in a new issue