Merge pull request #12099 from civicrm/5.2
authorEileen McNaughton <eileen@mcnaughty.com>
Tue, 8 May 2018 12:05:23 +0000 (00:05 +1200)
committerGitHub <noreply@github.com>
Tue, 8 May 2018 12:05:23 +0000 (00:05 +1200)
commit501875d5ad8f45436175b64e700f89048d4471c0
treee64498da41d63c98c9c3668a15704c8917484c52
parent81492488c6c0799d063a66d1ff314e3ed84cc715
parent51275f25841afc837c04a35efcd35aa89950ad3b
Merge pull request #12099 from civicrm/5.2

5.2 to master