Merge pull request #13152 from civicrm/5.8
authorEileen McNaughton <eileen@mcnaughty.com>
Sat, 24 Nov 2018 22:16:53 +0000 (11:16 +1300)
committerGitHub <noreply@github.com>
Sat, 24 Nov 2018 22:16:53 +0000 (11:16 +1300)
commit74b1365098f5f6b3d9eb9c75bb6dbf23a2be7278
treeb53ae51dacea937266e6fd2c93720c0b0148844c
parent1865ac5da0f8272363d23064f9db9b8be7c2b674
parent8689329c2799aa32a20c6628c594f8e8ef36fbe9
Merge pull request #13152 from civicrm/5.8

5.8 to master