From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 7 Apr 2021 05:10:58 +0000 (+1200)
Subject: Merge pull request #19985 from civicrm/5.36
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=65621f0bb048ec84f242e90fb5b4cd0b98d4c8db;p=civicrm-core.git

Merge pull request #19985 from civicrm/5.36

5.36 to master
---

65621f0bb048ec84f242e90fb5b4cd0b98d4c8db