From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 16 Mar 2023 07:33:30 +0000 (+1300)
Subject: Merge pull request #25843 from eileenmcnaughton/master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=505050e567c566c34e3c09c90edea3bbef0ca5bf;p=civicrm-core.git

Merge pull request #25843 from eileenmcnaughton/master

5.60 to master
---

505050e567c566c34e3c09c90edea3bbef0ca5bf