From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Fri, 17 Aug 2018 07:51:31 +0000 (+1200)
Subject: Merge pull request #12683 from civicrm/5.5
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=7e22e037f1447981918400a0743c44ea15704e99;p=civicrm-core.git

Merge pull request #12683 from civicrm/5.5

5.5
---

7e22e037f1447981918400a0743c44ea15704e99