Merge pull request #12863 from civicrm/5.6
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 24 Sep 2018 20:35:47 +0000 (08:35 +1200)
committerGitHub <noreply@github.com>
Mon, 24 Sep 2018 20:35:47 +0000 (08:35 +1200)
commit3c6f37bb3bc12da7773b48070e2efb26f294e2fb
tree11fbc4a1031b4a3db3c1a79ebbe3cdf81fe06020
parentf3a1a961d6a97d21a061ae71494229212dfb8ab6
parent54899c999852171f2904d97fd081b0c0fdef2432
Merge pull request #12863 from civicrm/5.6

5.6 to master