From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 2 Oct 2020 22:01:17 +0000 (+1300)
Subject: Merge pull request #18666 from civicrm/5.30
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=08642a59c721fc709053fb3ba9a9be4bcdccff2c;p=civicrm-core.git

Merge pull request #18666 from civicrm/5.30

5.30 to master
---

08642a59c721fc709053fb3ba9a9be4bcdccff2c