Merge pull request #25825 from civicrm/5.60
authorEileen McNaughton <emcnaughton@wikimedia.org>
Wed, 15 Mar 2023 19:18:12 +0000 (08:18 +1300)
committerGitHub <noreply@github.com>
Wed, 15 Mar 2023 19:18:12 +0000 (08:18 +1300)
5.60 to master


Trivial merge