From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sun, 31 May 2020 06:30:47 +0000 (+1200)
Subject: Merge pull request #17431 from civicrm/5.26
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=52d6c87ba373867ec4854e773707b7a81244cdbd;p=civicrm-core.git

Merge pull request #17431 from civicrm/5.26

5.26 to masterr
---

52d6c87ba373867ec4854e773707b7a81244cdbd