Merge pull request #12274 from civicrm/5.2
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 6 Jun 2018 13:09:57 +0000 (01:09 +1200)
committerGitHub <noreply@github.com>
Wed, 6 Jun 2018 13:09:57 +0000 (01:09 +1200)
commit8df04fbec4927b2e8fe765c825fdd31fc81632e0
tree61c16d7145f9e5b54f5ac02f5595b75642e50295
parent97dbd88c58d3242ced2cc18fe618a99db1e0c4ec
parentaa530a8d970cfc409a2cfe99665ac75e33d0a819
Merge pull request #12274 from civicrm/5.2

5.2 to master