Merge pull request #21835 from wmortada/patch-1

author Mathieu Lu <mathieu@civicrm.org>

Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)

committer GitHub <noreply@github.com>

Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)
author Mathieu Lu <mathieu@civicrm.org>
Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)
committer GitHub <noreply@github.com>
Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)
diff --cc sql/civicrm_generated.mysql
Simple merge
diff --cc sql/test_data_second_domain.mysql
Simple merge
author	Mathieu Lu <mathieu@civicrm.org>
	Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)
committer	GitHub <noreply@github.com>
	Fri, 5 Nov 2021 15:36:40 +0000 (11:36 -0400)
		1	2
sql/civicrm_generated.mysql	patch \|	diff1 \|	diff2 \|	blob \| history
sql/test_data_second_domain.mysql	patch \|	diff1 \|	diff2 \|	blob \| history