From: Tim Otten <totten@civicrm.org>
Date: Tue, 28 Mar 2023 07:06:23 +0000 (-0700)
Subject: Merge pull request #25943 from totten/master-mfw
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=66be1dbd04ed8b95a07beacf9d680b6338085a59;p=civicrm-core.git

Merge pull request #25943 from totten/master-mfw

Merge forward 5.60-rc=>master
---

66be1dbd04ed8b95a07beacf9d680b6338085a59