From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 17 Sep 2021 19:45:02 +0000 (+1200)
Subject: Merge pull request #21515 from civicrm/5.42
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dbd8a54f16f4e6501a014580c54a0be7d75752c2;p=civicrm-core.git

Merge pull request #21515 from civicrm/5.42

5.42 to master
---

dbd8a54f16f4e6501a014580c54a0be7d75752c2