Merge pull request #12985 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Mon, 22 Oct 2018 23:34:14 +0000 (12:34 +1300)
committerGitHub <noreply@github.com>
Mon, 22 Oct 2018 23:34:14 +0000 (12:34 +1300)
commitec05692bb7aabb62b43b172ac7bc2d0c515d4b9f
tree54dba90d648b686e382960fcbba11273272acf9a
parentcf7ff9534135a22ff0aff40b5c8cea548613f248
parentdcac81cbb4aa71619f37408c549e09e7e81c6e18
Merge pull request #12985 from civicrm/5.7

5.7 to master