From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sun, 2 Apr 2023 22:45:09 +0000 (+1200)
Subject: Merge pull request #25985 from civicrm/5.60
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3af313e5f5568260cd9f10589371360c3fe9df95;p=civicrm-core.git

Merge pull request #25985 from civicrm/5.60

5.60 to master
---

3af313e5f5568260cd9f10589371360c3fe9df95