Merge pull request #12814 from civicrm/5.6
authorEileen McNaughton <eileen@mcnaughty.com>
Wed, 12 Sep 2018 22:14:18 +0000 (10:14 +1200)
committerGitHub <noreply@github.com>
Wed, 12 Sep 2018 22:14:18 +0000 (10:14 +1200)
commit7bf3ce3c9dbbc4c037ed3585cc7e3fe19b2b67de
tree3f1419e4b5a4a32a8d278d504298024851ed8b1d
parentf3a84c75336aac66215be2c053b41d48b5f7022c
parent78d330fbf932025ca1e1852ed3399dd6123b1c9c
Merge pull request #12814 from civicrm/5.6

5.6 to master