From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 15 Mar 2019 20:54:59 +0000 (+1300)
Subject: Merge pull request #13834 from civicrm/5.12
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=118384fd8157b8b35b8e9229c162eb57a0e6985d;p=civicrm-core.git

Merge pull request #13834 from civicrm/5.12

5.12
---

118384fd8157b8b35b8e9229c162eb57a0e6985d