Merge pull request #12948 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 17 Oct 2018 19:12:59 +0000 (08:12 +1300)
committerGitHub <noreply@github.com>
Wed, 17 Oct 2018 19:12:59 +0000 (08:12 +1300)
commitca25577719e55af6eed496cea7dffa2bbe2a0fc0
treeb2936d4c4efed889ae4f3afba73858f5c7b4fd99
parentfc3d6bd566065ac319ac74dd001134fe28a38720
parent155390c3f2b586a9c4da79be8c8d19f5d94151ad
Merge pull request #12948 from civicrm/5.7

5.7 to master