Merge pull request #15458 from eileenmcnaughton/excetp

author Matthew Wire <mjw@mjwconsult.co.uk>

Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)

committer GitHub <noreply@github.com>

Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)
author Matthew Wire <mjw@mjwconsult.co.uk>
Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)
committer GitHub <noreply@github.com>
Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)
diff --cc CRM/Event/Form/Registration.php
Simple merge
diff --cc CRM/Event/Form/Registration/Confirm.php
Simple merge
author	Matthew Wire <mjw@mjwconsult.co.uk>
	Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)
committer	GitHub <noreply@github.com>
	Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)
		1	2
CRM/Event/Form/Registration.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history