Merge pull request #12089 from civicrm/5.2
authorEileen McNaughton <eileen@mcnaughty.com>
Sun, 6 May 2018 22:57:34 +0000 (10:57 +1200)
committerGitHub <noreply@github.com>
Sun, 6 May 2018 22:57:34 +0000 (10:57 +1200)
commit7b3fc260b66145edf343258eab753edf4e77634f
tree4eee7c2a8f4373cdc785c7fa44ddcf9100d6bc37
parentf2e76c3d5e8367492fae5ab83f6a2484527570a6
parent6dc551c2a4240660e92f2b573de9a272a5b5aa69
Merge pull request #12089 from civicrm/5.2

5.2 to master