From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 4 Jan 2024 05:18:57 +0000 (+1300)
Subject: Merge pull request #28868 from civicrm/5.69
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=adc8d52612fd8ce921469f4afd0ea0c35f233534;p=civicrm-core.git

Merge pull request #28868 from civicrm/5.69

5.69 to master
---

adc8d52612fd8ce921469f4afd0ea0c35f233534