Merge in 5.48
authorSeamus Lee <seamuslee001@gmail.com>
Thu, 24 Mar 2022 10:36:41 +0000 (21:36 +1100)
committerSeamus Lee <seamuslee001@gmail.com>
Thu, 24 Mar 2022 10:36:41 +0000 (21:36 +1100)
commit2ed6594ddea029d2d1dd2a98ce76c473c02b8968
treed27fad2c321074f4cc91a660bc6a911ca5738944
parent725d909b37632fc4c55dfa2a8d0e0cea81024795
parentfb919c2b4d2d3f2e482415f3087ecdd8e053f772
Merge in 5.48
14 files changed:
CRM/Contribute/BAO/Contribution.php
CRM/Core/CodeGen/GenerateData.php
CRM/Core/SelectValues.php
CRM/Event/DAO/Event.php
CRM/Event/Form/Participant.php
CRM/Event/Form/ParticipantFeeSelection.php
CRM/Event/Page/EventInfo.php
CRM/Event/Tokens.php
sql/civicrm_generated.mysql
templates/CRM/Event/Page/EventInfo.tpl
tests/phpunit/CRM/Utils/TokenConsistencyTest.php
xml/schema/Event/Event.xml
xml/templates/message_templates/payment_or_refund_notification_html.tpl
xml/templates/message_templates/payment_or_refund_notification_text.tpl