Skip to content
Commit 1637ef5a authored by Grazyna Jaworska's avatar Grazyna Jaworska
Browse files

Merge branch '7.x-3.x' into 2.4.x-test 

Conflicts:
	Provision/Config/Drupal/provision_drupal_settings_6.tpl.php
	Provision/Config/Drupal/provision_drupal_settings_7.tpl.php
	Provision/Config/Drupal/provision_drupal_settings_8.tpl.php
parents 1864179e 67d61009
Hide whitespace changes
Inline Side-by-side
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