Merge pull request #16156 from civicrm/5.21

author Seamus Lee <seamuslee001@gmail.com>

Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)

committer GitHub <noreply@github.com>

Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)
author Seamus Lee <seamuslee001@gmail.com>
Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)
committer GitHub <noreply@github.com>
Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)
diff --cc CRM/Event/Form/Registration/Confirm.php
Simple merge
diff --cc CRM/Event/Form/Registration/Register.php
Simple merge
author	Seamus Lee <seamuslee001@gmail.com>
	Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)
committer	GitHub <noreply@github.com>
	Sat, 28 Dec 2019 23:58:00 +0000 (10:58 +1100)
		1	2
CRM/Event/Form/Registration/Confirm.php	patch \|	diff1 \|	diff2 \|	blob \| history
CRM/Event/Form/Registration/Register.php	patch \|	diff1 \|	diff2 \|	blob \| history