Merge pull request #25847 from civicrm/5.60
authorEileen McNaughton <emcnaughton@wikimedia.org>
Thu, 16 Mar 2023 23:24:00 +0000 (12:24 +1300)
committerGitHub <noreply@github.com>
Thu, 16 Mar 2023 23:24:00 +0000 (12:24 +1300)
5.60


Trivial merge