From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 7 Sep 2019 00:57:55 +0000 (+1200)
Subject: Merge pull request #15237 from civicrm/5.18
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8d6badf255411aae62c2420547aca64bf4a521b8;p=civicrm-core.git

Merge pull request #15237 from civicrm/5.18

5.18
---

8d6badf255411aae62c2420547aca64bf4a521b8