Merge pull request #12964 from civicrm/5.7
authorEileen McNaughton <eileen@mcnaughty.com>
Fri, 19 Oct 2018 00:22:47 +0000 (13:22 +1300)
committerGitHub <noreply@github.com>
Fri, 19 Oct 2018 00:22:47 +0000 (13:22 +1300)
commited20eeb48b98cdcf3a5ffce7d54d383b186ccc97
treeadd6ed56c8c936de54470bc5c4e4fe21b8350c81
parentdf466fe7c79b59e699cf2437f5da2e6e548d5f7b
parentbd0ee330dc51f937501237154020d148d0ae16b1
Merge pull request #12964 from civicrm/5.7

5.7 to master