From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 9 Apr 2021 00:35:40 +0000 (+1200)
Subject: Merge pull request #20015 from civicrm/5.37
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e210e48a0505c718dd4ee13d8992a2d3248b3ed;p=civicrm-core.git

Merge pull request #20015 from civicrm/5.37

5.37 to master
---

9e210e48a0505c718dd4ee13d8992a2d3248b3ed