From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 27 Mar 2023 21:43:03 +0000 (+1300)
Subject: Merge pull request #25936 from civicrm/5.60
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2c179818ceefe119baedc960a5f17a94bdbffc7b;p=civicrm-core.git

Merge pull request #25936 from civicrm/5.60

5.60 to master
---

2c179818ceefe119baedc960a5f17a94bdbffc7b