Merge pull request #13234 from mattwire/checkduplicates_hook

author Eileen McNaughton <eileen@mcnaughty.com>

Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)

committer GitHub <noreply@github.com>

Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)
author Eileen McNaughton <eileen@mcnaughty.com>
Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)
committer GitHub <noreply@github.com>
Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)
diff --cc CRM/Contact/BAO/Contact.php
Simple merge
diff --cc CRM/Event/Form/Registration/Register.php
Simple merge
author	Eileen McNaughton <eileen@mcnaughty.com>
	Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)
committer	GitHub <noreply@github.com>
	Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)
		1	2
CRM/Contact/BAO/Contact.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Register.php	patch \|	diff1 \|	diff2 \|	blob \| history