From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 6 Apr 2021 19:19:02 +0000 (+1200)
Subject: Merge pull request #19979 from civicrm/5.36
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9e61795d22c8800bdc154d21613947bb113ee02d;p=civicrm-core.git

Merge pull request #19979 from civicrm/5.36

5.36 to master
---

9e61795d22c8800bdc154d21613947bb113ee02d