Skip to content
Snippets Groups Projects
Commit 21f348ca authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main' 

Merging develop into main

See merge request !32
parents ed2f7a75 c3ef96cf
No related branches found
Tags v3.7.40
1 merge request!32Merging develop into main
Pipeline #573649 failed
Stage: test
Hide whitespace changes
Inline Side-by-side
templates/settings.docker.php.twig
+ 2
− 0
View file @ 21f348ca
...@@ -38,6 +38,8 @@ $config['smtp.settings']['smtp_port'] = '1025'; ...@@ -38,6 +38,8 @@ $config['smtp.settings']['smtp_port'] = '1025';
$config['smtp.settings']['smtp_protocol'] = 'standard'; $config['smtp.settings']['smtp_protocol'] = 'standard';
$config['smtp.settings']['smtp_username'] = ''; $config['smtp.settings']['smtp_username'] = '';
$config['smtp.settings']['smtp_password'] = ''; $config['smtp.settings']['smtp_password'] = '';
$settings['danse_notification_delivery'] = {{ drupal.danse_notification_delivery|default('FALSE') }};
{% endif %} {% endif %}
{% elseif drupal.version <= 7 %} {% elseif drupal.version <= 7 %}
$databases = array( $databases = array(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment