Merge pull request #15242 from eileenmcnaughton/5.17
authorSeamus Lee <seamuslee001@gmail.com>
Sat, 7 Sep 2019 22:54:47 +0000 (08:54 +1000)
committerGitHub <noreply@github.com>
Sat, 7 Sep 2019 22:54:47 +0000 (08:54 +1000)
commit888d4453ce61cb50639af2f3ac881896109a57d7
treec0128a3f85d1bd4648a0eccc9a7b9dbb7de5d718
parentfa13f2dcaacce36bb310953a7a862fec8219b2c3
parent08e0c674357269376920b68b2ca50e2e2226ede1
Merge pull request #15242 from eileenmcnaughton/5.17

5.17 port of https://github.com/civicrm/civicrm-core/pull/15239